diff --git a/ccpp/physics b/ccpp/physics index f1f094009..a1e86a6be 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit f1f094009e0e36b29baa8dffb6a58e8969c58777 +Subproject commit a1e86a6be8b0381736c8a2951b4c7c192347145c diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90 index 7280867bf..9309064d8 100644 --- a/scm/src/GFS_typedefs.F90 +++ b/scm/src/GFS_typedefs.F90 @@ -162,11 +162,11 @@ module GFS_typedefs real (kind=kind_phys), pointer :: vvl (:,:) => null() !< layer mean vertical velocity in pa/sec real (kind=kind_phys), pointer :: tgrs (:,:) => null() !< model layer mean temperature in k real (kind=kind_phys), pointer :: qgrs (:,:,:) => null() !< layer mean tracer concentration -!3D-SA-TKE +!SA-3D-TKE real (kind=kind_phys), pointer :: def_1 (:,:) => null() !< deformation real (kind=kind_phys), pointer :: def_2 (:,:) => null() !< deformation real (kind=kind_phys), pointer :: def_3 (:,:) => null() !< deformation -!3D-SA-TKE-end +!SA-3D-TKE-end ! dissipation estimate real (kind=kind_phys), pointer :: diss_est(:,:) => null() !< model layer mean temperature in k ! soil state variables - for soil SPPT - sfc-perts, mgehne @@ -1188,6 +1188,8 @@ module GFS_typedefs logical :: hybedmf !< flag for hybrid edmf pbl scheme logical :: satmedmf !< flag for scale-aware TKE-based moist edmf !< vertical turbulent mixing scheme + logical :: tte_edmf !< flag for scale-aware TTE-based moist edmf + !< vertical turbulent mixing scheme logical :: shinhong !< flag for scale-aware Shinhong vertical turbulent mixing scheme logical :: do_ysu !< flag for YSU turbulent mixing scheme logical :: acm !< flag for ACM turbulent mixing scheme @@ -2322,21 +2324,21 @@ subroutine statein_create (Statein, Model) allocate (Statein%wgrs (IM,Model%levs)) endif allocate (Statein%qgrs (IM,Model%levs,Model%ntrac)) -!3D-SA-TKE +!SA-3D-TKE allocate (Statein%def_1 (IM,Model%levs)) allocate (Statein%def_2 (IM,Model%levs)) allocate (Statein%def_3 (IM,Model%levs)) -!3D-SA-TKE-end +!SA-3D-TKE-end Statein%qgrs = clear_val Statein%pgr = clear_val Statein%ugrs = clear_val Statein%vgrs = clear_val -!3D-SA-TKE +!SA-3D-TKE Statein%def_1 = clear_val Statein%def_2 = clear_val Statein%def_3 = clear_val -!3D-SA-TKE-end +!SA-3D-TKE-end if(Model%lightning_threat) then Statein%wgrs = clear_val @@ -3798,6 +3800,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, & logical :: hybedmf = .false. !< flag for hybrid edmf pbl scheme logical :: satmedmf = .false. !< flag for scale-aware TKE-based moist edmf !< vertical turbulent mixing scheme + logical :: tte_edmf = .false. !< flag for scale-aware TTE-based moist edmf + !< vertical turbulent mixing scheme logical :: shinhong = .false. !< flag for scale-aware Shinhong vertical turbulent mixing scheme logical :: do_ysu = .false. !< flag for YSU vertical turbulent mixing scheme logical :: acm = .false. !< flag for ACM vertical turbulent mixing scheme @@ -4234,7 +4238,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, & do_myjsfc, do_myjpbl, & hwrf_samfdeep, hwrf_samfshal,progsigma,progomega,betascu, & betamcu, betadcu,h2o_phys, pdfcld, shcnvcw, redrag, & - hybedmf, satmedmf, sigmab_coldstart, & + hybedmf, satmedmf, tte_edmf, sigmab_coldstart, & shinhong, do_ysu, dspheat, lheatstrg, lseaspray, cnvcld, & xr_cnvcld, random_clds, shal_cnv, imfshalcnv, imfdeepcnv, & isatmedmf, conv_cf_opt, do_deep, jcap, & @@ -5207,6 +5211,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, & Model%redrag = redrag Model%hybedmf = hybedmf Model%satmedmf = satmedmf + Model%tte_edmf = tte_edmf Model%shinhong = shinhong Model%do_ysu = do_ysu Model%acm = acm @@ -7135,6 +7140,7 @@ subroutine control_print(Model) print *, ' redrag : ', Model%redrag print *, ' hybedmf : ', Model%hybedmf print *, ' satmedmf : ', Model%satmedmf + print *, ' tte_edmf : ', Model%tte_edmf print *, ' isatmedmf : ', Model%isatmedmf print *, ' shinhong : ', Model%shinhong print *, ' do_ysu : ', Model%do_ysu diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta index 09975eeb1..56c1a8980 100644 --- a/scm/src/GFS_typedefs.meta +++ b/scm/src/GFS_typedefs.meta @@ -5503,6 +5503,12 @@ units = flag dimensions = () type = logical +[tte_edmf] + standard_name = flag_for_scale_aware_TTE_moist_EDMF_PBL + long_name = flag for scale-aware TTE moist EDMF PBL scheme + units = flag + dimensions = () + type = logical [shinhong] standard_name = flag_for_scale_aware_Shinhong_PBL long_name = flag for scale-aware Shinhong PBL scheme