Merge pull request #1 from grantfirl/HR4-GWD-update_gjf

Minor fixes for HR4 GWD update
Qingfu-Liu · Jun 3, 2024 · 64840cd · 64840cd
2 parents 4b797cb + 5e51ce5
commit 64840cd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90
@@ -2752,12 +2752,13 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
        !
     end if
 
-       allocate (Sfcprop%rmol   (IM ))
-       allocate (Sfcprop%flhc   (IM ))
-       allocate (Sfcprop%flqc   (IM ))
-       Sfcprop%rmol        = clear_val
-       Sfcprop%flhc        = clear_val
-       Sfcprop%flqc        = clear_val
+    allocate (Sfcprop%rmol   (IM ))
+    allocate (Sfcprop%flhc   (IM ))
+    allocate (Sfcprop%flqc   (IM ))
+    Sfcprop%rmol        = clear_val
+    Sfcprop%flhc        = clear_val
+    Sfcprop%flqc        = clear_val
+
     if (Model%do_mynnsfclay) then
     ! For MYNN surface layer scheme
        !print*,"Allocating all MYNN-sfclay variables"

diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta
@@ -5629,7 +5629,7 @@
 [alpha_fd]
   standard_name = alpha_coefficient_for_turbulent_orographic_form_drag
   long_name = alpha coefficient for Beljaars et al turbulent orographic form drag
-  units = none
+  units = 1
   dimensions = ()
   type = real
   kind = kind_phys
@@ -7468,7 +7468,7 @@
 [gwd_z0m_factor]
   standard_name = momentum_roughness_factor_in_turbulent_form_drag
   long_name = multiplication of Z0m in PSL turbulent form drag
-  units = count
+  units = 1
   dimensions = ()
   type = real
   kind = kind_phys

diff --git a/ccpp/physics b/ccpp/physics
+72 −64		physics/GWD/drag_suite.F90
+8 −15		physics/GWD/drag_suite.meta
+7 −6		physics/GWD/ugwpv1_gsldrag.F90
+9 −1		physics/GWD/ugwpv1_gsldrag.meta
+23 −9		physics/GWD/unified_ugwp.F90
+9 −25		physics/GWD/unified_ugwp.meta
+7 −3		physics/SFC_Models/Land/Noahmp/module_sf_noahmplsm.F90
+5 −1		physics/SFC_Models/Land/Noahmp/noahmpdrv.F90
+1 −1		physics/SFC_Models/Land/Noahmp/noahmpdrv.meta