Merge pull request NCAR#346 from grantfirl/ufs-dev-PR2

ufs/dev PR#2
scrasmussen · Oct 12, 2022 · 0b25b31 · 0b25b31
2 parents 3cb6c0e + 6fdd9a2
commit 0b25b31
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/ccpp/physics b/ccpp/physics
diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90
@@ -880,6 +880,7 @@ module GFS_typedefs
 
     !--- Thompson's microphysical parameters
     logical              :: ltaerosol       !< flag for aerosol version
+    logical              :: mraerosol       !< flag for merra2_aerosol_aware
     logical              :: lradar          !< flag for radar reflectivity
     real(kind=kind_phys) :: nsradar_reset   !< seconds between resetting radar reflectivity calculation
     real(kind=kind_phys) :: ttendlim        !< temperature tendency limiter per time step in K/s
@@ -2763,7 +2764,7 @@ subroutine coupling_create (Coupling, IM, Model)
     endif
 
     !--- needed for Thompson's aerosol option
-    if(Model%imp_physics == Model%imp_physics_thompson .and. Model%ltaerosol) then
+    if(Model%imp_physics == Model%imp_physics_thompson .and. (Model%ltaerosol .or. Model%mraerosol)) then
       allocate (Coupling%nwfa2d (IM))
       allocate (Coupling%nifa2d (IM))
       Coupling%nwfa2d   = clear_val
@@ -3051,6 +3052,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
 
     !--- Thompson microphysical parameters
     logical              :: ltaerosol      = .false.            !< flag for aerosol version
+    logical              :: mraerosol      = .false.            !< flag for merra2_aerosol_aware
     logical              :: lradar         = .false.            !< flag for radar reflectivity
     real(kind=kind_phys) :: nsradar_reset  = -999.0             !< seconds between resetting radar reflectivity calculation, set to <0 for every time step
     real(kind=kind_phys) :: ttendlim       = -999.0             !< temperature tendency limiter, set to <0 to deactivate
@@ -3453,7 +3455,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
                                use_LW_jacobian, doGP_lwscat, damp_LW_fluxadj, lfnc_k,       &
                                lfnc_p0, iovr_convcld, doGP_sgs_cnv, doGP_sgs_mynn,          &
                           ! IN CCN forcing
-                               iccn,                                                        &
+                               iccn, mraerosol,                                             &
                           !--- microphysical parameterizations
                                imp_physics, psautco, prautco, evpco, wminco,                &
                                fprcp, pdfflag, mg_dcs, mg_qcvar, mg_ts_auto_ice, mg_rhmini, &
@@ -4011,6 +4013,11 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
 
 !--- Thompson MP parameters
     Model%ltaerosol        = ltaerosol
+    Model%mraerosol        = mraerosol
+    if (Model%ltaerosol .and. Model%mraerosol) then
+      write(0,*) 'Logic error: Only one Thompson aerosol option can be true, either ltaerosol or mraerosol)'
+      stop
+    end if
     Model%lradar           = lradar
     Model%nsradar_reset    = nsradar_reset
     Model%ttendlim         = ttendlim
@@ -5298,6 +5305,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
       end if
       if (Model%me == Model%master) print *,' Using Thompson double moment microphysics', &
                                           ' ltaerosol = ',Model%ltaerosol, &
+                                          ' mraerosol = ',Model%mraerosol, &
                                           ' ttendlim =',Model%ttendlim, &
                                           ' ext_diag_thompson =',Model%ext_diag_thompson, &
                                           ' dt_inner =',Model%dt_inner, &
@@ -5802,6 +5810,7 @@ subroutine control_print(Model)
       if (Model%imp_physics == Model%imp_physics_wsm6 .or. Model%imp_physics == Model%imp_physics_thompson) then
         print *, ' Thompson microphysical parameters'
         print *, ' ltaerosol         : ', Model%ltaerosol
+        print *, ' mraerosol         : ', Model%mraerosol
         print *, ' lradar            : ', Model%lradar
         print *, ' nsradar_reset     : ', Model%nsradar_reset
         print *, ' lrefres           : ', Model%lrefres

diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta
@@ -4057,6 +4057,12 @@
   units = flag
   dimensions = ()
   type = logical
+[mraerosol]
+  standard_name = do_merra2_aerosol_awareness
+  long_name = flag for merra2 aerosol-aware physics for example the thompson microphysics
+  units = flag
+  dimensions = ()
+  type = logical
 [lradar]
   standard_name = flag_for_radar_reflectivity
   long_name = flag for radar reflectivity
+5 −5		physics/GFS_MP_generic_pre.F90
+7 −0		physics/GFS_MP_generic_pre.meta
+5 −3		physics/GFS_PBL_generic_common.F90
+18 −3		physics/GFS_PBL_generic_post.F90
+7 −0		physics/GFS_PBL_generic_post.meta
+21 −5		physics/GFS_PBL_generic_pre.F90
+8 −1		physics/GFS_PBL_generic_pre.meta
+5 −5		physics/GFS_rrtmg_pre.F90
+7 −0		physics/GFS_rrtmg_pre.meta
+10 −4		physics/GFS_rrtmgp_cloud_mp.F90
+7 −0		physics/GFS_rrtmgp_cloud_mp.meta
+46 −28		physics/module_mp_thompson.F90
+72 −18		physics/mp_thompson.F90
+30 −0		physics/mp_thompson.meta
+45 −2		physics/mynnedmf_wrapper.F90
+7 −0		physics/mynnedmf_wrapper.meta
+19 −11		physics/progsigma_calc.f90
+3 −1		physics/samfdeepcnv.f
+3 −2		physics/samfshalcnv.f