Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wdust #185

Merged
merged 2 commits into from
Aug 22, 2022
Merged

Fix wdust #185

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4dd88b
Fix initialization of wdust for ifdust settling, added wdustd to have…
jmaerz Aug 15, 2022
5f84b6a
revert changes related to initialization of wdust, keeping the fix fo…
jmaerz Aug 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions hamocc/ocprod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ subroutine ocprod(kpie,kpje,kpke,kbnd,pdlxp,pdlyp,pddpo,omask,ptho,pi_ph)
real :: absorption,absorption_uv
real :: dmsprod,dms_bac,dms_uv
real :: dtr,dz
real :: wpocd,wcald,wopald,dagg
real :: wpocd,wcald,wopald,wdustd,dagg
#ifdef sedbypass
real :: florca,flcaca,flsil
#endif
Expand Down Expand Up @@ -1049,7 +1049,7 @@ subroutine ocprod(kpie,kpje,kpke,kbnd,pdlxp,pdlyp,pddpo,omask,ptho,pi_ph)
! C(k,T+dt)=(ddpo(k)*C(k,T)+w*dt*C(k-1,T+dt))/(ddpo(k)+w*dt)
! sedimentation=w*dt*C(ks,T+dt)
!
!$OMP PARALLEL DO PRIVATE(kdonor,wpoc,wpocd,wcal,wcald,wopal,wopald &
!$OMP PARALLEL DO PRIVATE(kdonor,wpoc,wpocd,wcal,wcald,wopal,wopald,wdust,wdustd &
#if defined(AGG)
!$OMP ,wnos,wnosd,dagg &
#endif
Expand Down Expand Up @@ -1099,24 +1099,28 @@ subroutine ocprod(kpie,kpje,kpke,kbnd,pdlxp,pdlyp,pddpo,omask,ptho,pi_ph)
wnos = wnumb(i,j,k)
wnosd = wnumb(i,j,kdonor)
wdust = dustsink
wdustd = dustsink
dagg = dustagg(i,j,k)
#elif defined(WLIN)
wpoc = min(wmin+wlin*ptiestu(i,j,k), wmax)
wpocd = min(wmin+wlin*ptiestu(i,j,kdonor),wmax)
wcald = wcal
wopald = wopal
wdustd = wdust
dagg = 0.0
#else
wpocd = wpoc
wcald = wcal
wopald = wopal
wdustd = wdust
dagg = 0.0
#endif

if( k == 1 ) then
wpocd = 0.0
wcald = 0.0
wopald = 0.0
wdustd = 0.0
#if defined(AGG)
wnosd = 0.0
#elif defined(WLIN)
Expand Down Expand Up @@ -1153,7 +1157,7 @@ subroutine ocprod(kpie,kpje,kpke,kbnd,pdlxp,pdlyp,pddpo,omask,ptho,pi_ph)
& + ocetra(i,j,kdonor,iopal)*wopald)/ &
& (pddpo(i,j,k)+wopal)
ocetra(i,j,k,ifdust) = (ocetra(i,j,k ,ifdust) * pddpo(i,j,k) &
& + ocetra(i,j,kdonor,ifdust)*wdust)/ &
& + ocetra(i,j,kdonor,ifdust)*wdustd)/ &
& (pddpo(i,j,k)+wdust) - dagg
#ifdef AGG
ocetra(i,j,k,iphy) = (ocetra(i,j,k ,iphy) * pddpo(i,j,k) &
Expand Down