retract the changes from the Noahmp model

ccpp/data/GFS_typedefs.F90

@@ -1216,7 +1216,6 @@ module GFS_typedefs
     real(kind=kind_phys) :: cdmbgwd(4)      !< multiplication factors for cdmb, gwd and NS gwd, tke based enhancement
     real(kind=kind_phys) :: alpha_fd        !< alpha coefficient for turbulent orographic form drag
     real(kind=kind_phys) :: psl_gwd_dx_factor  !< multiplication factors for grid spacing
-    real(kind=kind_phys) :: gwd_z0m_factor  !< multiplication factors for z0m
     real(kind=kind_phys) :: sup             !< supersaturation in pdf cloud when t is very low
     real(kind=kind_phys) :: ctei_rm(2)      !< critical cloud top entrainment instability criteria
                                             !< (used if mstrat=.true.)
@@ -3762,7 +3761,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
     real(kind=kind_phys) :: cdmbgwd(4)     = (/2.0d0,0.25d0,1.0d0,1.0d0/)   !< multiplication factors for cdmb, gwd, and NS gwd, tke based enhancement
     real(kind=kind_phys) :: alpha_fd       = 12.0                     !< alpha coefficient for turbulent orographic form drag
     real(kind=kind_phys) :: psl_gwd_dx_factor  = 6.0                  !< multiplication factors for grid spacing
-    real(kind=kind_phys) :: gwd_z0m_factor  = 0.003                   !< multiplication factors for z0m
     real(kind=kind_phys) :: sup            = 1.0                      !< supersaturation in pdf cloud (IMP_physics=98) when t is very low
                                                                       !< or ice super saturation in SHOC (when do_shoc=.true.)
     real(kind=kind_phys) :: ctei_rm(2)     = (/10.0d0,10.0d0/)        !< critical cloud top entrainment instability criteria
@@ -4083,7 +4081,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
                                xr_cnvcld, random_clds, shal_cnv, imfshalcnv, imfdeepcnv,    &
                                isatmedmf, do_deep, jcap,                                    &
                                cs_parm, flgmin, cgwf, ccwf, cdmbgwd, alpha_fd,              &
-                               psl_gwd_dx_factor, gwd_z0m_factor,                           &
+                               psl_gwd_dx_factor,                                           &
                                sup, ctei_rm, crtrh,                                         &
                                dlqf, rbcr, shoc_parm, psauras, prauras, wminras,            &
                                do_sppt, do_shum, do_skeb,                                   &
@@ -4932,7 +4930,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
     Model%cdmbgwd           = cdmbgwd
     Model%alpha_fd          = alpha_fd
     Model%psl_gwd_dx_factor = psl_gwd_dx_factor
-    Model%gwd_z0m_factor    = gwd_z0m_factor
     Model%sup               = sup
     Model%ctei_rm           = ctei_rm
     Model%crtrh             = crtrh
@@ -6801,7 +6798,6 @@ subroutine control_print(Model)
       print *, ' cdmbgwd           : ', Model%cdmbgwd
       print *, ' alpha_fd          : ', Model%alpha_fd
       print *, ' psl_gwd_dx_factor : ', Model%psl_gwd_dx_factor
-      print *, ' gwd_z0m_factor    : ', Model%gwd_z0m_factor
       print *, ' sup               : ', Model%sup
       print *, ' ctei_rm           : ', Model%ctei_rm
       print *, ' crtrh             : ', Model%crtrh

ccpp/data/GFS_typedefs.meta

@@ -7465,13 +7465,6 @@
   dimensions = ()
   type = real
   kind = kind_phys
-[gwd_z0m_factor]
-  standard_name = momentum_roughness_factor_in_turbulent_form_drag
-  long_name = multiplication of Z0m in PSL turbulent form drag
-  units = 1
-  dimensions = ()
-  type = real
-  kind = kind_phys
 [do_ugwp_v1]
   standard_name = flag_for_ugwp_version_1
   long_name = flag to activate ver 1 CIRES UGWP