Merge pull request #7 from JiliDong-NOAA/nssl-microphysics-update-ted-cp

Nssl microphysics update ted cp
NOAA-GSL · Apr 7, 2021 · 01dae6b · 01dae6b
2 parents 6ef9984 + 6dfb186
commit 01dae6b
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 60 deletions.
diff --git a/physics/GFS_MP_generic.F90 b/physics/GFS_MP_generic.F90
@@ -84,9 +84,6 @@ end subroutine GFS_MP_generic_post_init
 !!
 !> \section gfs_mp_gen GFS MP Generic Post General Algorithm
 !> @{
-! Dong
-!      subroutine GFS_MP_generic_post_run(im, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac, imp_physics, imp_physics_gfdl, imp_physics_nssl,    &
-!        imp_physics_thompson, imp_physics_mg, imp_physics_fer_hires, cal_pre, lssav, ldiag3d, qdiag3d, cplflx, cplchm, con_g, dtf, frain, rainc, rain1,   &
 
       subroutine GFS_MP_generic_post_run(im, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac, imp_physics, imp_physics_gfdl,     &
         imp_physics_thompson, imp_physics_mg, imp_physics_fer_hires, imp_physics_nssl2m, imp_physics_nssl2mccn,           &
@@ -118,7 +115,7 @@ subroutine GFS_MP_generic_post_run(im, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac,
       real(kind=kind_phys), dimension(im),      intent(in   ) :: sr
       real(kind=kind_phys), dimension(im),      intent(inout) :: rain, domr_diag, domzr_diag, domip_diag, doms_diag, tprcp,  &
                                                                  srflag, cnvprcp, totprcp, totice, totsnw, totgrp, cnvprcpb, &
-                                                                 ttotprcpb, toticeb, totsnwb, totgrpb, rain_cpl, rainc_cpl,  &
+                                                                 totprcpb, toticeb, totsnwb, totgrpb, rain_cpl, rainc_cpl,  &
                                                                  snow_cpl, pwat
 
       real(kind=kind_phys), dimension(:,:),     intent(inout) :: dt3dt ! only if ldiag3d
@@ -227,7 +224,7 @@ subroutine GFS_MP_generic_post_run(im, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac,
 !
 !       HCHUANG: use new precipitation type to decide snow flag for LSM snow accumulation
 
-        if (imp_physics /= imp_physics_gfdl .and. imp_physics /= imp_physics_thompson .and. imp_physics /= imp_physics_nssl) then
+        if (imp_physics /= imp_physics_gfdl .and. imp_physics /= imp_physics_thompson) then
           do i=1,im
             tprcp(i)  = max(zero, rain(i) )
             if(doms(i) > zero .or. domip(i) > zero) then

diff --git a/physics/GFS_MP_generic.meta b/physics/GFS_MP_generic.meta
@@ -224,14 +224,6 @@
   type = integer
   intent = in
   optional = F
-[imp_physics_nssl]
-  standard_name = flag_for_nssl_microphysics_scheme
-  long_name = choice of NSSL microphysics scheme
-  units = flag
-  dimensions = ()
-  type = integer
-  intent = in
-  optional = F
 [imp_physics_thompson]
   standard_name = flag_for_thompson_microphysics_scheme
   long_name = choice of Thompson microphysics scheme

diff --git a/physics/GFS_PBL_generic.F90 b/physics/GFS_PBL_generic.F90
@@ -104,7 +104,7 @@ subroutine GFS_PBL_generic_pre_run (im, levs, nvdiff, ntrac,
       integer, intent(in) :: ntwa, ntia, ntgl, ntoz, ntke, ntkev, nqrimef,ntchs, ntchm
       integer, intent(in) :: ntccn, nthl, nthnc, ntgv, nthv
       logical, intent(in) :: trans_aero, ldiag3d, qdiag3d, lssav
-      integer, intent(in) :: imp_physics, imp_physics_gfdl, imp_physics_nssl, imp_physics_thompson, imp_physics_wsm6
+      integer, intent(in) :: imp_physics, imp_physics_gfdl, imp_physics_thompson, imp_physics_wsm6
       integer, intent(in) :: imp_physics_zhao_carr, imp_physics_mg, imp_physics_fer_hires
       integer, intent(in) :: imp_physics_nssl2m, imp_physics_nssl2mccn
       logical, intent(in) :: cplchm, ltaerosol, nssl_hail_on, hybedmf, do_shoc, satmedmf

diff --git a/physics/GFS_PBL_generic.meta b/physics/GFS_PBL_generic.meta
@@ -255,14 +255,6 @@
   type = integer
   intent = in
   optional = F
-[imp_physics_nssl]
-  standard_name = flag_for_nssl_microphysics_scheme
-  long_name = choice of NSSL microphysics scheme
-  units = flag
-  dimensions = ()
-  type = integer
-  intent = in
-  optional = F
 [imp_physics_thompson]
   standard_name = flag_for_thompson_microphysics_scheme
   long_name = choice of Thompson microphysics scheme

diff --git a/physics/GFS_rrtmg_pre.F90 b/physics/GFS_rrtmg_pre.F90
@@ -23,7 +23,7 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp,        &
         imp_physics_nssl2m, imp_physics_nssl2mccn,                             &
         imp_physics_thompson, imp_physics_gfdl, imp_physics_zhao_carr,         &
         imp_physics_zhao_carr_pdf, imp_physics_mg, imp_physics_wsm6,           &
-        imp_physics_fer_hires, imp_physics_nssl, julian, yearlen, lndp_var_list, lsswr, lslwr,   &
+        imp_physics_fer_hires, julian, yearlen, lndp_var_list, lsswr, lslwr,   &
         ltaerosol, lgfdlmprad, uni_cld, effr_in, do_mynnedmf, lmfshal,         &
         lmfdeep2, fhswr, fhlwr, solhr, sup, eps, epsm1, fvirt,                 &
         rog, rocp, con_rd, xlat_d, xlat, xlon, coslat, sinlat, tsfc, slmsk,    &
@@ -82,7 +82,7 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp,        &
                                            imfdeepcnv_gf, me, ncnd, ntrac,     &
                                            num_p3d, npdf3d, ncnvcld3d, ntqv,   &
                                            ntcw, ntiw, ntlnc, ntinc, ncld,     &
-                                           ntrw, ntsw, ntgl, ntwa, ntoz,       &
+                                           ntrw, ntsw, ntgl, nthl, ntwa, ntoz, &
                                            ntclamt, nleffr, nieffr, nseffr,    &
                                            lndp_type,                          &
                                            kdt, imp_physics,                   &
@@ -93,7 +93,6 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp,        &
                                            imp_physics_mg, imp_physics_wsm6,   &
                                     imp_physics_nssl2m, imp_physics_nssl2mccn, &
                                            imp_physics_fer_hires,              &
-                                           imp_physics_nssl,                   &
                                            yearlen, icloud
 
       character(len=3), dimension(:), intent(in) :: lndp_var_list

diff --git a/physics/GFS_rrtmg_pre.meta b/physics/GFS_rrtmg_pre.meta
@@ -287,7 +287,8 @@
   units = flag
   dimensions = ()
   type = integer
-  intent = in-  optional = F
+  intent = in
+  optional = F
 [imp_physics_thompson]
   standard_name = flag_for_thompson_microphysics_scheme
   long_name = choice of Thompson microphysics scheme
@@ -344,14 +345,6 @@
   type = integer
   intent = in
   optional = F
-[imp_physics_nssl]
-  standard_name = flag_for_nssl_microphysics_scheme
-  long_name = choice of NSSL microphysics scheme
-  units = flag
-  dimensions = ()
-  type = integer
-  intent = in
-  optional = F
 [julian]
   standard_name = julian_day
   long_name = julian day

diff --git a/physics/GFS_suite_interstitial.meta b/physics/GFS_suite_interstitial.meta
@@ -1383,14 +1383,6 @@
   type = integer
   intent = in
   optional = F
-[imp_physics_nssl]
-  standard_name = flag_for_nssl_microphysics_scheme
-  long_name = choice of NSSL microphysics scheme
-  units = flag
-  dimensions = ()
-  type = integer
-  intent = in
-  optional = F
 [imp_physics_thompson]
   standard_name = flag_for_thompson_microphysics_scheme
   long_name = choice of Thompson microphysics scheme

diff --git a/physics/maximum_hourly_diagnostics.meta b/physics/maximum_hourly_diagnostics.meta
@@ -63,14 +63,6 @@
   type = integer
   intent = in
   optional = F
-[imp_physics_nssl]
-  standard_name = flag_for_nssl_microphysics_scheme
-  long_name = choice of NSSL microphysics scheme
-  units = flag
-  dimensions = ()
-  type = integer
-  intent = in
-  optional = F
 [imp_physics_fer_hires]
   standard_name = flag_for_fer_hires_microphysics_scheme
   long_name = choice of Ferrier-Aligo microphysics scheme

diff --git a/physics/module_MYNNPBL_wrapper.F90 b/physics/module_MYNNPBL_wrapper.F90
@@ -92,7 +92,7 @@ SUBROUTINE mynnedmf_wrapper_run(        &
      &  bl_mynn_edmf_part, bl_mynn_cloudmix, bl_mynn_mixqt,&
      &  bl_mynn_output,                                    &
      &  icloud_bl, do_mynnsfclay,                          &
-     &  imp_physics, imp_physics_gfdl, imp_physics_nssl,   &
+     &  imp_physics, imp_physics_gfdl,                     &
      &  imp_physics_thompson, imp_physics_wsm6,            &
      &  imp_physics_nssl2m, imp_physics_nssl2mccn,         &
      &  ltaerosol, lprnt, errmsg, errflg  )
@@ -453,7 +453,7 @@ SUBROUTINE mynnedmf_wrapper_run(        &
               enddo
             enddo
           endif
-        elseif (imp_physics == imp_physics_gfdl .or. imp_physics == imp_physics_nssl) then
+        elseif (imp_physics == imp_physics_gfdl ) then
   ! GFDL MP
           FLAG_QI = .true.
           FLAG_QNI= .false.

diff --git a/physics/module_MYNNPBL_wrapper.meta b/physics/module_MYNNPBL_wrapper.meta
@@ -1229,14 +1229,6 @@
   type = integer
   intent = in
   optional = F
-[imp_physics_nssl]
-  standard_name = flag_for_nssl_microphysics_scheme
-  long_name = choice of NSSL microphysics scheme
-  units = flag
-  dimensions = ()
-  type = integer
-  intent = in
-  optional = F
 [imp_physics_thompson]
   standard_name = flag_for_thompson_microphysics_scheme
   long_name = choice of Thompson microphysics scheme