fixes wfa and adds wfa surface emissions

NCAR · Jun 5, 2024 · 7a73486 · 7a73486
1 parent 5979847
commit 7a73486
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/drivers/mpas/module_mp_thompson.F90 b/drivers/mpas/module_mp_thompson.F90
@@ -696,6 +696,12 @@ subroutine thompson_3d_to_1d_driver(qv, qc, qr, qi, qs, qg, qb, ni, nr, nc, ng,
 
                     ! nwfa, nifa, and nc are optional aerosol-aware variables
                     if (present(nwfa)) then
+                        if (present(nwfa2d)) then
+                           if (k == kts) then
+                              nwfa(i,k,j) = nwfa(i,k,j) + nwfa2d(i,j) * dt
+                           endif
+                        endif
+                        nwfa(i,k,j) = max(nwfa_default, min(aero_max, nwfa(i,k,j)))
                         nwfa1d(k) = nwfa(i,k,j)
                     else
                         nwfa1d(k) = nwfa_default / rho(k)

diff --git a/module_mp_thompson_main.F90 b/module_mp_thompson_main.F90
@@ -2066,16 +2066,16 @@ subroutine mp_thompson_main(qv1d, qc1d, qi1d, qr1d, qs1d, qg1d, qb1d, ni1d, nr1d
                     endif
                 else
                     prw_vcd(k) = -rc(k)*orho*odt
-                    ! pnc_wcd(k) = -nc(k)*orho*odt
-                    pnc_wcd(k) = 0.0
+                    pnc_wcd(k) = -nc(k)*orho*odt
                 endif
 
                 !+---+-----------------------------------------------------------------+
 
                 qvten(k) = qvten(k) - prw_vcd(k)
                 qcten(k) = qcten(k) + prw_vcd(k)
                 ncten(k) = ncten(k) + pnc_wcd(k)
-                ! Be careful here: initial cloud evaporation can increase aerosols
+                ! Be careful here: depending on initial conditions,
+                ! cloud evaporation can increase aerosols
                 if (configs%aerosol_aware) nwfaten(k) = nwfaten(k) - pnc_wcd(k)
 
                 tten(k) = tten(k) + lvap(k)*ocp(k)*prw_vcd(k)*(1-IFDRY)