From 3c3a2e3dddea2adf3ea5a22f2dadb320b00d7789 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 3 Jan 2023 17:27:48 -0500 Subject: [PATCH] update GFS_typedefs in accordance with ufs-dev-PR27 and ccpp/physics submodule pointer --- ccpp/physics | 2 +- scm/src/GFS_typedefs.F90 | 6 +++++- scm/src/GFS_typedefs.meta | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ccpp/physics b/ccpp/physics index fc1d6217e..0c79a088f 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit fc1d6217ea6344898a45488bccaf6a3612dbb94d +Subproject commit 0c79a088f30407b17c0d91f21d05d410ce90729f diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90 index 4bdfa78dd..03e542bf6 100644 --- a/scm/src/GFS_typedefs.F90 +++ b/scm/src/GFS_typedefs.F90 @@ -1175,6 +1175,7 @@ module GFS_typedefs real(kind=kind_phys) :: rlmx !< maximum allowed mixing length in boundary layer mass flux scheme real(kind=kind_phys) :: elmx !< maximum allowed dissipation mixing length in boundary layer mass flux scheme integer :: sfc_rlm !< choice of near surface mixing length in boundary layer mass flux scheme + integer :: tc_pbl !< control for TC applications in the PBL scheme !--- parameters for canopy heat storage (CHS) parameterization real(kind=kind_phys) :: h0facu !< CHS factor for sensible heat flux in unstable surface layer @@ -3340,6 +3341,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & real(kind=kind_phys) :: rlmx = 300. !< maximum allowed mixing length in boundary layer mass flux scheme real(kind=kind_phys) :: elmx = 300. !< maximum allowed dissipation mixing length in boundary layer mass flux scheme integer :: sfc_rlm = 0 !< choice of near surface mixing length in boundary layer mass flux scheme + integer :: tc_pbl = 0 !< control for TC applications in the PBL scheme !--- parameters for canopy heat storage (CHS) parameterization real(kind=kind_phys) :: h0facu = 0.25 @@ -3543,7 +3545,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & thsfc_loc, & ! vertical diffusion xkzm_m, xkzm_h, xkzm_s, xkzminv, moninq_fac, dspfac, & - bl_upfr, bl_dnfr, rlmx, elmx, sfc_rlm, & + bl_upfr, bl_dnfr, rlmx, elmx, sfc_rlm, tc_pbl, & !--- canopy heat storage parameterization h0facu, h0facs, & !--- cellular automata @@ -4374,6 +4376,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%rlmx = rlmx Model%elmx = elmx Model%sfc_rlm = sfc_rlm + Model%tc_pbl = tc_pbl !--- canopy heat storage parametrization Model%h0facu = h0facu @@ -6062,6 +6065,7 @@ subroutine control_print(Model) print *, ' rlmx : ', Model%rlmx print *, ' elmx : ', Model%elmx print *, ' sfc_rlm : ', Model%sfc_rlm + print *, ' tc_pbl : ', Model%tc_pbl print *, ' ' print *, 'parameters for canopy heat storage parametrization' print *, ' h0facu : ', Model%h0facu diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta index 07b84ce8d..0bf39b3ba 100644 --- a/scm/src/GFS_typedefs.meta +++ b/scm/src/GFS_typedefs.meta @@ -5016,6 +5016,12 @@ units = none dimensions = () type = integer +[tc_pbl] + standard_name = control_for_TC_applications_in_the_PBL_scheme + long_name = control for TC applications in the PBL scheme + units = none + dimensions = () + type = integer [h0facu] standard_name = multiplicative_tuning_parameter_for_reduced_surface_heat_fluxes_due_to_canopy_heat_storage long_name = canopy heat storage factor for sensible heat flux in unstable surface layer