diff --git a/.gitmodules b/.gitmodules index a012324010..19905b3418 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev + url = https://github.com/hafs-community/ccpp-physics + branch = feature/gfspbl_lpt [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 8d90054332..0615f8fdc2 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -1377,6 +1377,7 @@ module GFS_typedefs 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 + integer :: use_lpt !< control for using Liquid Potential Temp for TC applications in the GFSPBL scheme !--- parameters for canopy heat storage (CHS) parameterization real(kind=kind_phys) :: h0facu !< CHS factor for sensible heat flux in unstable surface layer @@ -3918,6 +3919,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & 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 + integer :: use_lpt = 0 !< control for using Liquid Potential Temp for TC applications in the GFSPBL scheme !--- parameters for canopy heat storage (CHS) parameterization real(kind=kind_phys) :: h0facu = 0.25 @@ -4184,7 +4186,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & diag_flux, diag_log, & ! vertical diffusion xkzm_m, xkzm_h, xkzm_s, xkzminv, moninq_fac, dspfac, & - bl_upfr, bl_dnfr, rlmx, elmx, sfc_rlm, tc_pbl, & + bl_upfr, bl_dnfr, rlmx, elmx, sfc_rlm, tc_pbl, use_lpt, & !--- canopy heat storage parameterization h0facu, h0facs, & !--- cellular automata @@ -5155,6 +5157,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%elmx = elmx Model%sfc_rlm = sfc_rlm Model%tc_pbl = tc_pbl + Model%use_lpt = use_lpt !--- canopy heat storage parametrization Model%h0facu = h0facu @@ -7000,6 +7003,7 @@ subroutine control_print(Model) print *, ' elmx : ', Model%elmx print *, ' sfc_rlm : ', Model%sfc_rlm print *, ' tc_pbl : ', Model%tc_pbl + print *, ' use_lpt : ', Model%use_lpt print *, ' ' print *, 'parameters for canopy heat storage parametrization' print *, ' h0facu : ', Model%h0facu diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 04562b7db7..67e95bccaa 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -6112,6 +6112,12 @@ units = none dimensions = () type = integer +[use_lpt] + standard_name = control_for_using_LPT_for_TC_applications_in_the_PBL_scheme + long_name = control for using LPT in 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 diff --git a/ccpp/physics b/ccpp/physics index ad5a241193..51a295206c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit ad5a2411937b48c1153ee53f9b16264afa830fd7 +Subproject commit 51a295206c142589f18577f909d968d2cf4a8dc8