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 aerosol deep convective transport (SAMF) and aerosol scavenging (RAS) #714

Merged
merged 8 commits into from
Aug 13, 2021
Merged

Fix aerosol deep convective transport (SAMF) and aerosol scavenging (RAS) #714

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae5207f
Use 60mb above surface instead of level of free convection (LFC)
rmontuoro Jul 26, 2021
dca87a1
Use proper bounds for the aerosol scavenging factor array
rmontuoro Jul 27, 2021
641a45c
Set correct metadata description for input index of first
rmontuoro Jul 28, 2021
3439abe
Rename input array for consistency with caller subroutine.
rmontuoro Jul 28, 2021
cfe36c6
Merge branch 'main' into hotfix/aerosol-convective-transport
rmontuoro Jul 29, 2021
8ad150e
Merge branch 'main' into hotfix/aerosol-convective-transport
rmontuoro Aug 9, 2021
0f92e6b
Merge branch 'main' into hotfix/aerosol-convective-transport
rmontuoro Aug 10, 2021
890da66
Merge branch 'main' into hotfix/aerosol-convective-transport
rmontuoro Aug 12, 2021
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
5 changes: 3 additions & 2 deletions physics/rascnv.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,9 @@ subroutine rascnv_run(IM, k, itc, ntc, ntr, dt, dtf &
!
fscav_ = -999.0_kp ! By default no scavenging
if (itc > 0 .and. ntc > 0) then
if (ntr >= itc + ntc - 3) then
fscav_(itc:ntc) = fscav
n = itc + ntc - 1
if (n <= ntr + 2) then
fscav_(itc:n) = fscav
else
errmsg = 'Error in rascnv_run: test ntr >= itc + ntc - 3 FAILED'
errflg = 1
Expand Down
6 changes: 3 additions & 3 deletions physics/rascnv.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@
intent = in
optional = F
[itc]
standard_name = number_of_aerosol_tracers_for_convection
long_name = number of aerosol tracers transported/scavenged by convection
units = count
standard_name = index_of_first_chemical_tracer_for_convection
long_name = index of first chemical tracer transported/scavenged by convection
units = index
dimensions = ()
type = integer
intent = in
Expand Down
2 changes: 1 addition & 1 deletion physics/samfdeepcnv.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2683,7 +2683,7 @@ subroutine samfdeepcnv_run (im,km,itc,ntc,cliq,cp,cvap, &

if (do_aerosols)
& call samfdeepcnv_aerosols(im, im, km, itc, ntc, ntr, delt,
& xlamde, xlamdd, cnvflg, jmin, kb, kmax, kbcon, ktcon, fscav,
& xlamde, xlamdd, cnvflg, jmin, kb, kmax, kd94, ktcon, fscav,
& edto, xlamd, xmb, c0t, eta, etad, zi, xlamue, xlamud, delp,
& qtr, qaero)

Expand Down
6 changes: 3 additions & 3 deletions physics/samfdeepcnv.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
intent = in
optional = F
[itc]
standard_name = number_of_aerosol_tracers_for_convection
long_name = number of aerosol tracers transported/scavenged by convection
units = count
standard_name = index_of_first_chemical_tracer_for_convection
long_name = index of first chemical tracer transported/scavenged by convection
units = index
dimensions = ()
type = integer
intent = in
Expand Down
6 changes: 3 additions & 3 deletions physics/samfshalcnv.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
intent = in
optional = F
[itc]
standard_name = number_of_aerosol_tracers_for_convection
long_name = number of aerosol tracers transported/scavenged by convection
units = count
standard_name = index_of_first_chemical_tracer_for_convection
long_name = index of first chemical tracer transported/scavenged by convection
units = index
dimensions = ()
type = integer
intent = in
Expand Down