Commit 3901528a authored by Karsten Bolding's avatar Karsten Bolding

removed trailing blanks

parent 93119d2a
...@@ -454,7 +454,7 @@ ...@@ -454,7 +454,7 @@
#endif #endif
#ifdef _FABM_ #ifdef _FABM_
if ( allocated(fabm_pel) ) then 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,:) fabm_ben(i,j,:)=fabm_ben(i,j+1,:)
end if end if
#endif #endif
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
allocate(ipg_v(I3DFIELD),stat=rc) ! 3D field for ipg_v allocate(ipg_v(I3DFIELD),stat=rc) ! 3D field for ipg_v
if (rc /= 0) stop 'init_3d: Error allocating memory (ipg_v)' if (rc /= 0) stop 'init_3d: Error allocating memory (ipg_v)'
#endif #endif
#ifdef STRUCTURE_FRICTION #ifdef STRUCTURE_FRICTION
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
! !DESCRIPTION: ! !DESCRIPTION:
! !
! Here, the physical tracer variance decay for the tracer $F$, ! 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 ! due to horizontal and vertical
! mixing is calculated as proposed in \cite{BURCHARDea08b}: ! mixing is calculated as proposed in \cite{BURCHARDea08b}:
! \begin{equation} ! \begin{equation}
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
do j=jmin,jmax do j=jmin,jmax
do i=imin-1,imax do i=imin-1,imax
if (au(i,j) .gt. 0) then 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 else
aux(i,j,k)=_ZERO_ aux(i,j,k)=_ZERO_
end if end if
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
do k=1,kmax do k=1,kmax
do j=jmin,jmax do j=jmin,jmax
do i=imin,imax 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 end do
end do end do
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
do j=jmin-1,jmax do j=jmin-1,jmax
do i=imin,imax do i=imin,imax
if (av(i,j) .gt. 0) then 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 else
aux(i,j,k)=_ZERO_ aux(i,j,k)=_ZERO_
end if end if
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
do k=1,kmax do k=1,kmax
do j=jmin,jmax do j=jmin,jmax
do i=imin,imax 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 end do
end do end do
......
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
! advective fluxes resulting from the continuity equation ! advective fluxes resulting from the continuity equation
! (\ref{ContiLayerInt}). Continuity will ! (\ref{ContiLayerInt}). Continuity will
! still be retained due to the linearity of the continuity equation. ! still be retained due to the linearity of the continuity equation.
! !
! \paragraph{Numerical dissipation.}\label{uvadvect-dissipation} ! \paragraph{Numerical dissipation.}\label{uvadvect-dissipation}
! !
! For the directional split method, numerical dissipation is calculated ! For the directional split method, numerical dissipation is calculated
...@@ -388,15 +388,15 @@ ...@@ -388,15 +388,15 @@
call toc(TIM_UVADV3DH) call toc(TIM_UVADV3DH)
if (do_numerical_analyses) then 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 j=jmin-HALO,jmax+HALO
do i=imin-HALO,imax+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 end do
end do end do
vel2o=vel2 vel2o=vel2
end if end if
call do_advection_3d(dt,uuEx,uadv,vadv,wadv,huadv,hvadv,hoadv,hnadv,& call do_advection_3d(dt,uuEx,uadv,vadv,wadv,huadv,hvadv,hoadv,hnadv,&
dxuadv,dxvadv,dyuadv,dyvadv,area_inv, & dxuadv,dxvadv,dyuadv,dyvadv,area_inv, &
...@@ -430,7 +430,7 @@ ...@@ -430,7 +430,7 @@
end do end do
end do end do
end if end if
!$OMP PARALLEL DEFAULT(SHARED) PRIVATE(i,j,k) !$OMP PARALLEL DEFAULT(SHARED) PRIVATE(i,j,k)
...@@ -505,10 +505,10 @@ ...@@ -505,10 +505,10 @@
call toc(TIM_UVADV3DH) call toc(TIM_UVADV3DH)
if (do_numerical_analyses) then 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 j=jmin-HALO,jmax+HALO
do i=imin-HALO,imax+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 end do
end do end do
......
...@@ -189,9 +189,9 @@ ...@@ -189,9 +189,9 @@
uu = _ZERO_ ; vv = _ZERO_ ; ww = _ZERO_ uu = _ZERO_ ; vv = _ZERO_ ; ww = _ZERO_
#ifdef _MOMENTUM_TERMS_ #ifdef _MOMENTUM_TERMS_
tdv_u = _ZERO_ ; adv_u = _ZERO_ ; vsd_u = _ZERO_ ; hsd_u = _ZERO_ 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_ 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 #endif
ssen = _ZERO_ ; ssun = _ZERO_ ; ssvn = _ZERO_ ssen = _ZERO_ ; ssun = _ZERO_ ; ssvn = _ZERO_
rru= _ZERO_ ; rrv= _ZERO_ rru= _ZERO_ ; rrv= _ZERO_
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
read(NAMLST,domain) read(NAMLST,domain)
if (crit_depth .lt. 2.5*min_depth) then 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 end if
#ifndef STATIC #ifndef STATIC
......
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
if (allocated(fabm_pel)) then if (allocated(fabm_pel)) then
allocate(fabmmean_ids(size(model%info%state_variables)),stat=err) allocate(fabmmean_ids(size(model%info%state_variables)),stat=err)
if (err /= 0) stop 'init_mean_ncdf(): Error allocating memory (fabmmean_ids)' if (err /= 0) stop 'init_mean_ncdf(): Error allocating memory (fabmmean_ids)'
do n=1,size(model%info%state_variables) 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)) 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 if (err .NE. NF90_NOERR) go to 10
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment