Merge pull request #1 from grantfirl/mynn_01March_gjf

Remove MYNN SFC logic from noahmpdrv.F90 and fix CMakeLists.txt authors
SamuelTrahanNOAA · Mar 21, 2023 · f7a4342 · f7a4342
2 parents 4cc7227 + ffccfc8
commit f7a4342
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(ccpp_physics
 
 #------------------------------------------------------------------------------
 set(PACKAGE "ccpp-physics")
-set(AUTHORS "Grant Firl" "Dom Heinzeller" "Man Zhang" "Mike Kavulich" "Chunxi Zhang")
+set(AUTHORS "Grant Firl" "Dustin Swales" "Man Zhang" "Mike Kavulich" )
 
 #------------------------------------------------------------------------------
 # Set OpenMP flags for C/C++/Fortran
@@ -183,7 +183,9 @@ set_target_properties(ccpp_physics PROPERTIES VERSION ${PROJECT_VERSION}
 target_include_directories(ccpp_physics PUBLIC
                            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
 
-target_link_libraries(ccpp_physics PUBLIC w3emc::w3emc_d NetCDF::NetCDF_Fortran)
+target_link_libraries(ccpp_physics PUBLIC w3emc::w3emc_d
+                                          sp::sp_d
+                                          NetCDF::NetCDF_Fortran)
 
 # Define where to install the library
 install(TARGETS ccpp_physics

diff --git a/physics/module_mp_nssl_2mom.F90 b/physics/module_mp_nssl_2mom.F90
@@ -1228,6 +1228,7 @@ SUBROUTINE nssl_2mom_init(  &
       rho_qh   = nssl_params(8)
       rho_qhl  = nssl_params(9)
       rho_qs   = nssl_params(10)
+      alphar   = nssl_params(14)
 
 !      ipelec   = Nint(nssl_params(11))
 !      isaund   = Nint(nssl_params(12))

diff --git a/physics/mp_nssl.F90 b/physics/mp_nssl.F90
@@ -31,6 +31,7 @@ subroutine mp_nssl_init(ncol, nlev, errflg, errmsg, threads, restart, &
                               con_t0c, con_cliq, con_csol, con_eps,   &
                               imp_physics, imp_physics_nssl,  &
                               nssl_cccn, nssl_alphah, nssl_alphahl, &
+                              nssl_alphar, nssl_ehw0_in, nssl_ehlw0_in,   &
                               nssl_ccn_on, nssl_hail_on, nssl_invertccn ) 
 
 
@@ -52,6 +53,7 @@ subroutine mp_nssl_init(ncol, nlev, errflg, errmsg, threads, restart, &
          integer,                   intent(in)    :: imp_physics
          integer,                   intent(in)    :: imp_physics_nssl
          real(kind_phys),           intent(in)    :: nssl_cccn, nssl_alphah, nssl_alphahl
+         real(kind_phys),           intent(in)    :: nssl_alphar, nssl_ehw0_in, nssl_ehlw0_in 
          logical,                   intent(in)    :: nssl_ccn_on, nssl_hail_on, nssl_invertccn
 
          ! Local variables: dimensions used in nssl_init
@@ -115,6 +117,7 @@ subroutine mp_nssl_init(ncol, nlev, errflg, errmsg, threads, restart, &
          nssl_params(11) = 0 ! nssl_ipelec_tmp
          nssl_params(12) = 11 ! nssl_isaund
          nssl_params(13) = 0 ! 1= turn on cccna; 0 = turn off
+         nssl_params(14)  = nssl_alphar
 
          nssl_qccn = nssl_cccn/1.225
       !   if (mpirank==mpiroot) then
@@ -129,7 +132,7 @@ subroutine mp_nssl_init(ncol, nlev, errflg, errmsg, threads, restart, &
 
 !           write(0,*) 'call nssl_2mom_init'
          CALL nssl_2mom_init(ims,ime, jms,jme, kms,kme,nssl_params,ipctmp=5,mixphase=0, &
-                     ihvol=ihailv,errmsg=errmsg,errflg=errflg,myrank=mpirank,mpiroot=mpiroot)
+                ihvol=ihailv,nssl_ehw0=nssl_ehw0_in,nssl_ehlw0=nssl_ehlw0_in,errmsg=errmsg,errflg=errflg,myrank=mpirank,mpiroot=mpiroot)
 
          ! For restart runs, the init is done here
          if (restart) then

diff --git a/physics/mp_nssl.meta b/physics/mp_nssl.meta
@@ -151,37 +151,61 @@
   intent = in
 [nssl_alphah]
   standard_name = nssl_alpha_graupel
-  long_name = graupel PSD shape parameter in NSSL micro
+  long_name = graupel particle size distribution(PSD) shape parameter in NSSL microphysics scheme
   units = none
   dimensions = ()
   type = real
   kind = kind_phys
   intent = in
 [nssl_alphahl]
   standard_name = nssl_alpha_hail
-  long_name = hail PSD shape parameter in NSSL micro
+  long_name = hail particle size distribution(PSD) shape parameter in NSSL microphysics scheme
+  units = none
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
+[nssl_alphar]
+  standard_name = nssl_alpha_rain
+  long_name = rain particle size distribution(PSD) shape parameter in NSSL microphysics scheme
+  units = none
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
+[nssl_ehw0_in]
+  standard_name = nssl_graupel_collection_efficiency 
+  long_name = graupel droplet collection efficiency in NSSL microphysics scheme
+  units = none
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
+[nssl_ehlw0_in]
+  standard_name = nssl_hail_collection_efficiency 
+  long_name = hail droplet collection efficiency in NSSL microphysics scheme
   units = none
   dimensions = ()
   type = real
   kind = kind_phys
   intent = in
 [nssl_ccn_on]
   standard_name = nssl_ccn_on
-  long_name = CCN activation flag in NSSL micro
+  long_name = CCN activation flag in NSSL microphysics scheme
   units = flag
   dimensions = ()
   type = logical
   intent = in
 [nssl_hail_on]
   standard_name = nssl_hail_on
-  long_name = hail activation flag in NSSL micro
+  long_name = hail activation flag in NSSL microphysics scheme
   units = flag
   dimensions = ()
   type = logical
   intent = in
 [nssl_invertccn]
   standard_name = nssl_invertccn
-  long_name = flag to invert CCN in NSSL micro
+  long_name = flag to invert CCN in NSSL microphysics scheme
   units = flag
   dimensions = ()
   type = logical
@@ -571,21 +595,21 @@
   intent = in
 [nssl_ccn_on]
   standard_name = nssl_ccn_on
-  long_name = CCN activation flag in NSSL micro
+  long_name = CCN activation flag in NSSL microphysics scheme
   units = flag
   dimensions = ()
   type = logical
   intent = in
 [nssl_hail_on]
   standard_name = nssl_hail_on
-  long_name = hail activation flag in NSSL micro
+  long_name = hail activation flag in NSSL microphysics scheme
   units = flag
   dimensions = ()
   type = logical
   intent = in
 [nssl_invertccn]
   standard_name = nssl_invertccn
-  long_name = flag to invert CCN in NSSL micro
+  long_name = flag to invert CCN in NSSL microphysics scheme
   units = flag
   dimensions = ()
   type = logical

diff --git a/physics/noahmpdrv.F90 b/physics/noahmpdrv.F90
@@ -77,13 +77,6 @@ subroutine noahmpdrv_init(lsm, lsm_noahmp, me, isot, ivegsrc, &
           return
         end if
 
-        if (.not. do_mynnsfclay .and. do_mynnedmf) then
-          errmsg = 'Problem : do_mynnsfclay = .false.' // &
-                   'but mynnpbl is .true.. Exiting ...'
-          errflg = 1
-          return
-        end if
-
         if ( do_mynnsfclay .and. .not. do_mynnedmf) then
           errmsg = 'Problem : do_mynnsfclay = .true.' // &
                    'but mynnpbl is .false.. Exiting ...'