ufs-dev PR#337

.gitmodules

@@ -4,8 +4,10 @@
 	branch = develop
 [submodule "ccpp-physics"]
 	path = ccpp/physics
-	url = https://github.com/NCAR/ccpp-physics
-	branch = scm/dev
+	# url = https://github.com/NCAR/ccpp-physics
+	# branch = scm/dev
+	url = https://github.com/scrasmussen/ccpp-physics
+	branch = ufs-dev-PR337
 [submodule "CMakeModules"]
 	path = CMakeModules
 	url = https://github.com/noaa-emc/CMakeModules

ccpp/config/ccpp_prebuild_config.py

@@ -194,8 +194,6 @@
     'ccpp/physics/physics/MP/TEMPO/mp_tempo_pre.F90',
     'ccpp/physics/physics/MP/TEMPO/mp_tempo.F90',
     'ccpp/physics/physics/MP/TEMPO/mp_tempo_post.F90',
-    'ccpp/physics/physics/MP/Zhao_Carr/zhaocarr_gscond.f',
-    'ccpp/physics/physics/MP/Zhao_Carr/zhaocarr_precpd.f',
     'ccpp/physics/physics/PBL/HEDMF/hedmf.f',
     'ccpp/physics/physics/PBL/SHOC/moninshoc.f',
     'ccpp/physics/physics/PBL/SHOC/shoc.F90',

scm/src/CCPP_typedefs.F90

@@ -1102,7 +1102,7 @@ subroutine gfs_interstitial_destroy (Interstitial, Model)
        deallocate (Interstitial%t2mmp)
        deallocate (Interstitial%q2mp)
     end if
-    
+
   end subroutine gfs_interstitial_destroy
 
   subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
@@ -1209,16 +1209,12 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
         Interstitial%ntcwx = 2
         Interstitial%ntiwx = 3
         Interstitial%ntrwx = 4
-      elseif (Model%imp_physics == Model%imp_physics_zhao_carr) then
-        Interstitial%ntcwx = 2
       endif
     endif
 
     if (Model%cplchm) then
       ! Only the following microphysics schemes are supported with coupled chemistry
-      if (Model%imp_physics == Model%imp_physics_zhao_carr) then
-        Interstitial%nvdiff = 3
-      elseif (Model%imp_physics == Model%imp_physics_mg) then
+      if (Model%imp_physics == Model%imp_physics_mg) then
         if (Model%ntgl > 0) then
           Interstitial%nvdiff = 12
         else
@@ -1670,7 +1666,7 @@ subroutine gfs_interstitial_reset (Interstitial, Model)
     ! Use same logic in UFS to reset Thompson extended diagnostics
     Interstitial%ext_diag_thompson_reset = Interstitial%max_hourly_reset
 
-    ! Frequency flag for computing the full radar reflectivity (water coated ice) 
+    ! Frequency flag for computing the full radar reflectivity (water coated ice)
     if (Model%nsfullradar_diag<0) then
       Interstitial%fullradar_diag = .true.
     else

scm/src/GFS_typedefs.F90

@@ -973,8 +973,6 @@ module GFS_typedefs
     integer              :: imp_physics_thompson      = 8  !< choice of Thompson microphysics scheme
     integer              :: imp_physics_tempo         = 88 !< choice of TEMPO microphysics scheme
     integer              :: imp_physics_wsm6          = 6  !< choice of WSMG     microphysics scheme
-    integer              :: imp_physics_zhao_carr     = 99 !< choice of Zhao-Carr microphysics scheme
-    integer              :: imp_physics_zhao_carr_pdf = 98 !< choice of Zhao-Carr microphysics scheme with PDF clouds
     integer              :: imp_physics_mg            = 10 !< choice of Morrison-Gettelman microphysics scheme
     integer              :: imp_physics_fer_hires     = 15 !< choice of Ferrier-Aligo microphysics scheme
     integer              :: imp_physics_nssl          = 17 !< choice of NSSL microphysics scheme with background CCN
@@ -4980,7 +4978,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me,         &
     Model%effr_in          = effr_in
     ! turn off ICCN interpolation when MG2/3 are not used
     if (.not. Model%imp_physics==Model%imp_physics_mg) Model%iccn = 0
-!--- Zhao-Carr MP parameters
     Model%psautco          = psautco
     Model%prautco          = prautco
     Model%evpco            = evpco
@@ -6410,30 +6407,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me,         &
     Model%nps2delt = -999
     Model%npsdelt  = -999
     Model%ncnd     = nwat - 1                   ! ncnd is the number of cloud condensate types
-    if (Model%imp_physics == Model%imp_physics_zhao_carr) then
-      Model%npdf3d   = 0
-      Model%num_p3d  = 4
-      Model%num_p2d  = 3
-      Model%shcnvcw  = .false.
-      Model%nT2delt  = 1
-      Model%nqv2delt = 2
-      Model%nTdelt   = 3
-      Model%nqvdelt  = 4
-      Model%nps2delt = 1
-      Model%npsdelt  = 2
-      if (nwat /= 2) then
-        print *,' Zhao-Carr MP requires nwat to be set to 2 - job aborted'
-        error stop
-      end if
-      if (Model%me == Model%master) print *,' Using Zhao/Carr/Sundqvist Microphysics'
-
-    elseif (Model%imp_physics == Model%imp_physics_zhao_carr_pdf) then !Zhao Microphysics with PDF cloud
-      Model%npdf3d  = 3
-      Model%num_p3d = 4
-      Model%num_p2d = 3
-      if (Model%me == Model%master) print *,'Using Zhao/Carr/Sundqvist Microphysics with PDF Cloud'
-
-    else if (Model%imp_physics == Model%imp_physics_fer_hires) then     ! Ferrier-Aligo scheme
+    if (Model%imp_physics == Model%imp_physics_fer_hires) then     ! Ferrier-Aligo scheme
       Model%npdf3d  = 0
       Model%num_p3d = 3
       Model%num_p2d = 1
@@ -6682,7 +6656,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me,         &
       Model%xr_con = xr_con
       Model%xr_exp = xr_exp
     else  ! values have not been read in from namelist and should be set according to logic in radiation_clouds.f
-      if (Model%imp_physics == Model%imp_physics_zhao_carr .or. Model%imp_physics == Model%imp_physics_mg .or. Model%imp_physics == Model%imp_physics_fer_hires) then
+      if (Model%imp_physics == Model%imp_physics_mg .or. Model%imp_physics == Model%imp_physics_fer_hires) then
         if (.not. Model%lmfshal) then
           !calls cloud_fraction_XuRandall()
           Model%xr_con = 2000.0
@@ -7102,14 +7076,6 @@ subroutine control_print(Model)
       print *, ' imp_physics       : ', Model%imp_physics
       print *, ' '
 
-      if (Model%imp_physics == Model%imp_physics_zhao_carr .or. Model%imp_physics == Model%imp_physics_zhao_carr_pdf) then
-        print *, ' Z-C microphysical parameters'
-        print *, ' psautco           : ', Model%psautco
-        print *, ' prautco           : ', Model%prautco
-        print *, ' evpco             : ', Model%evpco
-        print *, ' wminco            : ', Model%wminco
-        print *, ' '
-      endif
       if ((Model%imp_physics == Model%imp_physics_wsm6) .or. (Model%imp_physics == Model%imp_physics_thompson) .or. &
            (Model%imp_physics == Model%imp_physics_tempo)) then
         print *, ' Thompson microphysical parameters'

scm/src/GFS_typedefs.meta

@@ -4560,18 +4560,6 @@
   units = flag
   dimensions = ()
   type = integer
-[imp_physics_zhao_carr]
-  standard_name = identifier_for_zhao_carr_microphysics_scheme
-  long_name = choice of Zhao-Carr microphysics scheme
-  units = flag
-  dimensions = ()
-  type = integer
-[imp_physics_zhao_carr_pdf]
-  standard_name = identifier_for_zhao_carr_pdf_microphysics_scheme
-  long_name = choice of Zhao-Carr microphysics scheme with PDF clouds
-  units = flag
-  dimensions = ()
-  type = integer
 [imp_physics_mg]
   standard_name = identifier_for_morrison_gettelman_microphysics_scheme
   long_name = choice of Morrison-Gettelman microphysics scheme