Skip to content
Snippets Groups Projects
Commit 0014b1e0 authored by Lucie Bakels's avatar Lucie Bakels
Browse files

settling threshold only for forward runs 

Former-commit-id: 7297d126
parent 993efdd9
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 7 additions and 5 deletions
src/advance_mod.f90
+ 7
− 5
View file @ 0014b1e0
...@@ -410,14 +410,14 @@ subroutine adv_above_pbl(itime,itimec,dxsave,dysave,ux,vy,tropop,nrand,ipart) ...@@ -410,14 +410,14 @@ subroutine adv_above_pbl(itime,itimec,dxsave,dysave,ux,vy,tropop,nrand,ipart)
call get_settling(xts,yts,zts,nsp,part(ipart)%settling) call get_settling(xts,yts,zts,nsp,part(ipart)%settling)
#ifdef ETA #ifdef ETA
call update_zeta_to_z(itime,ipart) call update_zeta_to_z(itime,ipart)
if (part(ipart)%z+part(ipart)%settling*dt.lt.0) then if ((ldirect.eq.1).and.(part(ipart)%z+part(ipart)%settling*dt.lt.0.)) then
part(ipart)%settling=-part(ipart)%z/dt part(ipart)%settling=-part(ipart)%z/dt
endif endif
call w_to_weta(itime,dt,part(ipart)%xlon,part(ipart)%ylat, & call w_to_weta(itime,dt,part(ipart)%xlon,part(ipart)%ylat, &
part(ipart)%z,part(ipart)%zeta,part(ipart)%settling,weta_settling) part(ipart)%z,part(ipart)%zeta,part(ipart)%settling,weta_settling)
weta=weta+weta_settling weta=weta+weta_settling
#else #else
if (part(ipart)%z+part(ipart)%settling*dt.lt.0) then if ((ldirect.eq.1).and.(part(ipart)%z+part(ipart)%settling*dt.lt.0.)) then
part(ipart)%settling=-part(ipart)%z/dt part(ipart)%settling=-part(ipart)%z/dt
endif endif
w=w+part(ipart)%settling w=w+part(ipart)%settling
...@@ -592,7 +592,7 @@ subroutine adv_in_pbl(itime,itimec, dxsave,dysave,dawsave,dcwsave, abovePBL, & ...@@ -592,7 +592,7 @@ subroutine adv_in_pbl(itime,itimec, dxsave,dysave,dawsave,dcwsave, abovePBL, &
endif endif
if (density(nsp).gt.0.) then if (density(nsp).gt.0.) then
call get_settling(xts,yts,zts,nsp,part(ipart)%settling) !bugfix call get_settling(xts,yts,zts,nsp,part(ipart)%settling) !bugfix
if (part(ipart)%z+part(ipart)%settling*dt.lt.0) then if ((ldirect.eq.1).and.(part(ipart)%z+part(ipart)%settling*dt.lt.0.)) then
part(ipart)%settling=-part(ipart)%z/dt part(ipart)%settling=-part(ipart)%z/dt
endif endif
w=w+part(ipart)%settling w=w+part(ipart)%settling
...@@ -721,7 +721,8 @@ subroutine petterssen_corr(itime,ipart) ...@@ -721,7 +721,8 @@ subroutine petterssen_corr(itime,ipart)
call update_z_to_zeta(itime+part(ipart)%idt,ipart) call update_z_to_zeta(itime+part(ipart)%idt,ipart)
zts=real(part(ipart)%z) zts=real(part(ipart)%z)
call get_settling(xts,yts,zts,nsp,part(ipart)%settling) !bugfix call get_settling(xts,yts,zts,nsp,part(ipart)%settling) !bugfix
if (part(ipart)%z+part(ipart)%settling*part(ipart)%idt.lt.0) then if ((ldirect.eq.1).and. &
(part(ipart)%z+part(ipart)%settling*part(ipart)%idt.lt.0)) then
part(ipart)%settling=-part(ipart)%z/part(ipart)%idt part(ipart)%settling=-part(ipart)%z/part(ipart)%idt
endif endif
call w_to_weta( & call w_to_weta( &
...@@ -733,7 +734,8 @@ subroutine petterssen_corr(itime,ipart) ...@@ -733,7 +734,8 @@ subroutine petterssen_corr(itime,ipart)
!real(part(ipart)%zeta-part(ipart)%zeta_prev)/real(part(ipart)%idt*ldirect) !real(part(ipart)%zeta-part(ipart)%zeta_prev)/real(part(ipart)%idt*ldirect)
#else #else
call get_settling(xts,yts,zts,nsp,part(ipart)%settling) call get_settling(xts,yts,zts,nsp,part(ipart)%settling)
if (part(ipart)%z+part(ipart)%settling*part(ipart)%idt.lt.0) then if ((ldirect.eq.1).and. &
(part(ipart)%z+part(ipart)%settling*part(ipart)%idt.lt.0)) then
part(ipart)%settling=-part(ipart)%z/part(ipart)%idt part(ipart)%settling=-part(ipart)%z/part(ipart)%idt
endif endif
w=w+part(ipart)%settling w=w+part(ipart)%settling
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment