udpate GFS_typedefs and ccpp/physics submodule pointer to work with u…

…fs-dev-PR64
grantfirl · May 9, 2023 · 75ef9ef · 75ef9ef
1 parent c884770
commit 75ef9ef
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,8 +4,10 @@
 	branch = main
 [submodule "ccpp-physics"]
 	path = ccpp/physics
-	url = https://github.com/NCAR/ccpp-physics
-	branch = main
+	#url = https://github.com/NCAR/ccpp-physics
+	#branch = main
+        url = https://github.com/grantfirl/ccpp-physics
+        branch = ufs-dev-PR64
 [submodule "CMakeModules"]
 	path = CMakeModules
 	url = https://github.com/noaa-emc/CMakeModules

diff --git a/ccpp/physics b/ccpp/physics
diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90
@@ -267,6 +267,7 @@ module GFS_typedefs
     real (kind=kind_phys), pointer :: spec_lh_flux (:) => null() !< specified kinematic surface latent heat flux
 
 !-- In/Out
+    real (kind=kind_phys), pointer :: maxupmf(:)   => null()  !< maximum up draft mass flux for Grell-Freitas
     real (kind=kind_phys), pointer :: conv_act(:)  => null()  !< convective activity counter for Grell-Freitas
     real (kind=kind_phys), pointer :: conv_act_m(:)=> null()  !< midlevel convective activity counter for Grell-Freitas
     real (kind=kind_phys), pointer :: hice   (:)   => null()  !< sea ice thickness
@@ -2554,8 +2555,10 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
        Sfcprop%lh          = clear_val
     end if
     if (Model%imfdeepcnv == Model%imfdeepcnv_gf .or. Model%imfdeepcnv == Model%imfdeepcnv_unified) then
+        allocate (Sfcprop%maxupmf(IM))
         allocate (Sfcprop%conv_act(IM))
         allocate (Sfcprop%conv_act_m(IM))
+        Sfcprop%maxupmf = zero
         Sfcprop%conv_act = zero
         Sfcprop%conv_act_m = zero
     end if

diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta
@@ -972,6 +972,14 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
+[maxupmf]
+  standard_name = maximum_convective_updraft_mass_flux
+  long_name = maximum convective updraft mass flux within a column
+  units = m s-1
+  dimensions = (horizontal_loop_extent)
+  type = real
+  kind = kind_phys
+  active = (control_for_deep_convection_scheme == identifier_for_grell_freitas_deep_convection)
 [conv_act]
   standard_name = consecutive_calls_for_grell_freitas_convection
   long_name = Memory counter for GF