From 3901528ae5a95ba6a804dee5332883966f5736f9 Mon Sep 17 00:00:00 2001 From: Karsten Bolding Date: Mon, 19 Mar 2012 15:22:05 +0100 Subject: [PATCH] removed trailing blanks --- src/3d/bdy_3d.F90 | 2 +- src/3d/dynamic_allocations_3d.h | 2 +- src/3d/physical_mixing.F90 | 10 +++++----- src/3d/uv_advect_3d.F90 | 14 +++++++------- src/3d/variables_3d.F90 | 4 ++-- src/domain/domain.F90 | 2 +- src/ncdf/init_mean_ncdf.F90 | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/3d/bdy_3d.F90 b/src/3d/bdy_3d.F90 index e6b5d6d3..da63844d 100644 --- a/src/3d/bdy_3d.F90 +++ b/src/3d/bdy_3d.F90 @@ -454,7 +454,7 @@ #endif #ifdef _FABM_ if ( allocated(fabm_pel) ) then - fabm_pel(i,j,:,:) = fabm_pel(i,j+1,:,:) + fabm_pel(i,j,:,:) = fabm_pel(i,j+1,:,:) fabm_ben(i,j,:)=fabm_ben(i,j+1,:) end if #endif diff --git a/src/3d/dynamic_allocations_3d.h b/src/3d/dynamic_allocations_3d.h index d89806d8..e28416ff 100644 --- a/src/3d/dynamic_allocations_3d.h +++ b/src/3d/dynamic_allocations_3d.h @@ -50,7 +50,7 @@ allocate(ipg_v(I3DFIELD),stat=rc) ! 3D field for ipg_v if (rc /= 0) stop 'init_3d: Error allocating memory (ipg_v)' - + #endif #ifdef STRUCTURE_FRICTION diff --git a/src/3d/physical_mixing.F90 b/src/3d/physical_mixing.F90 index fe0c79fd..2a361c7a 100644 --- a/src/3d/physical_mixing.F90 +++ b/src/3d/physical_mixing.F90 @@ -10,7 +10,7 @@ ! !DESCRIPTION: ! ! Here, the physical tracer variance decay for the tracer $F$, -! ${ D}^{\mbox{\scriptsize phys}}\left(\langle F \rangle^2 \right)$, +! ${ D}^{\mbox{\scriptsize phys}}\left(\langle F \rangle^2 \right)$, ! due to horizontal and vertical ! mixing is calculated as proposed in \cite{BURCHARDea08b}: ! \begin{equation} @@ -59,7 +59,7 @@ do j=jmin,jmax do i=imin-1,imax if (au(i,j) .gt. 0) then - aux(i,j,k)=_TWO_*AH*((F(i+1,j,k)-F(i,j,k))/DXU)**2 + aux(i,j,k)=_TWO_*AH*((F(i+1,j,k)-F(i,j,k))/DXU)**2 else aux(i,j,k)=_ZERO_ end if @@ -69,7 +69,7 @@ do k=1,kmax do j=jmin,jmax do i=imin,imax - pm3d(i,j,k)=pm3d(i,j,k)+_HALF_*(aux(i,j,k)+aux(i-1,j,k)) + pm3d(i,j,k)=pm3d(i,j,k)+_HALF_*(aux(i,j,k)+aux(i-1,j,k)) end do end do end do @@ -78,7 +78,7 @@ do j=jmin-1,jmax do i=imin,imax if (av(i,j) .gt. 0) then - aux(i,j,k)=_TWO_*AH*((F(i,j+1,k)-F(i,j,k))/DYV)**2 + aux(i,j,k)=_TWO_*AH*((F(i,j+1,k)-F(i,j,k))/DYV)**2 else aux(i,j,k)=_ZERO_ end if @@ -88,7 +88,7 @@ do k=1,kmax do j=jmin,jmax do i=imin,imax - pm3d(i,j,k)=pm3d(i,j,k)+_HALF_*(aux(i,j,k)+aux(i,j-1,k)) + pm3d(i,j,k)=pm3d(i,j,k)+_HALF_*(aux(i,j,k)+aux(i,j-1,k)) end do end do end do diff --git a/src/3d/uv_advect_3d.F90 b/src/3d/uv_advect_3d.F90 index 31602773..e220572d 100644 --- a/src/3d/uv_advect_3d.F90 +++ b/src/3d/uv_advect_3d.F90 @@ -247,7 +247,7 @@ ! advective fluxes resulting from the continuity equation ! (\ref{ContiLayerInt}). Continuity will ! still be retained due to the linearity of the continuity equation. -! +! ! \paragraph{Numerical dissipation.}\label{uvadvect-dissipation} ! ! For the directional split method, numerical dissipation is calculated @@ -388,15 +388,15 @@ call toc(TIM_UVADV3DH) if (do_numerical_analyses) then - do k=1,kmax ! calculate square of u-velocity before advection step + do k=1,kmax ! calculate square of u-velocity before advection step do j=jmin-HALO,jmax+HALO do i=imin-HALO,imax+HALO - vel2(i,j,k)=uuEx(i,j,k)**2 + vel2(i,j,k)=uuEx(i,j,k)**2 end do end do end do vel2o=vel2 - end if + end if call do_advection_3d(dt,uuEx,uadv,vadv,wadv,huadv,hvadv,hoadv,hnadv,& dxuadv,dxvadv,dyuadv,dyvadv,area_inv, & @@ -430,7 +430,7 @@ end do end do end if - + !$OMP PARALLEL DEFAULT(SHARED) PRIVATE(i,j,k) @@ -505,10 +505,10 @@ call toc(TIM_UVADV3DH) if (do_numerical_analyses) then - do k=1,kmax ! calculate square of v-velocity before advection step + do k=1,kmax ! calculate square of v-velocity before advection step do j=jmin-HALO,jmax+HALO do i=imin-HALO,imax+HALO - vel2(i,j,k)=vvEx(i,j,k)**2 + vel2(i,j,k)=vvEx(i,j,k)**2 end do end do end do diff --git a/src/3d/variables_3d.F90 b/src/3d/variables_3d.F90 index 0dea8fdd..5d6e783b 100644 --- a/src/3d/variables_3d.F90 +++ b/src/3d/variables_3d.F90 @@ -189,9 +189,9 @@ uu = _ZERO_ ; vv = _ZERO_ ; ww = _ZERO_ #ifdef _MOMENTUM_TERMS_ tdv_u = _ZERO_ ; adv_u = _ZERO_ ; vsd_u = _ZERO_ ; hsd_u = _ZERO_ - cor_u = _ZERO_ ; epg_u = _ZERO_ ; ipg_u = _ZERO_ + cor_u = _ZERO_ ; epg_u = _ZERO_ ; ipg_u = _ZERO_ tdv_v = _ZERO_ ; adv_v = _ZERO_ ; vsd_v = _ZERO_ ; hsd_v = _ZERO_ - cor_v = _ZERO_ ; epg_v = _ZERO_ ; ipg_v = _ZERO_ + cor_v = _ZERO_ ; epg_v = _ZERO_ ; ipg_v = _ZERO_ #endif ssen = _ZERO_ ; ssun = _ZERO_ ; ssvn = _ZERO_ rru= _ZERO_ ; rrv= _ZERO_ diff --git a/src/domain/domain.F90 b/src/domain/domain.F90 index 8fa78352..57e7f550 100644 --- a/src/domain/domain.F90 +++ b/src/domain/domain.F90 @@ -179,7 +179,7 @@ read(NAMLST,domain) if (crit_depth .lt. 2.5*min_depth) then - stop 'crit_depth must be larger than 2.5 time min_depth' + stop 'crit_depth must be larger than 2.5 time min_depth' end if #ifndef STATIC diff --git a/src/ncdf/init_mean_ncdf.F90 b/src/ncdf/init_mean_ncdf.F90 index e549d44e..e2f47116 100644 --- a/src/ncdf/init_mean_ncdf.F90 +++ b/src/ncdf/init_mean_ncdf.F90 @@ -274,7 +274,7 @@ if (allocated(fabm_pel)) then allocate(fabmmean_ids(size(model%info%state_variables)),stat=err) if (err /= 0) stop 'init_mean_ncdf(): Error allocating memory (fabmmean_ids)' - + do n=1,size(model%info%state_variables) err = nf90_def_var(ncid,model%info%state_variables(n)%name,NCDF_FLOAT_PRECISION,f4_dims,fabmmean_ids(n)) if (err .NE. NF90_NOERR) go to 10 -- GitLab