From b0a33c549e186878e673ca529a783f771730e906 Mon Sep 17 00:00:00 2001 From: "Bin.Liu" Date: Fri, 11 Jul 2025 08:36:43 -0500 Subject: [PATCH 1/6] Update submodule fv3/atmos_cubed_sphere with fixes. --- .gitmodules | 12 ++++++++---- fv3/atmos_cubed_sphere | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index a01232401..7b945c84f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,19 @@ [submodule "fv3/atmos_cubed_sphere"] path = fv3/atmos_cubed_sphere - url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere - branch = dev/emc + url = https://github.com/hafs-community/GFDL_atmos_cubed_sphere + branch = feature/3dtke_update +# url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere +# branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework 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/3dtke_update +# url = https://github.com/ufs-community/ccpp-physics +# branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index 4f1a5ef4b..fc06b5cc1 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 4f1a5ef4b83461a79a62c8d965ebc2b26cf5eba8 +Subproject commit fc06b5cc136c0f04ccaadbfe969376e309d1f8c0 From 1eaa9bd298f4ad143c34643feb7330832cc4de37 Mon Sep 17 00:00:00 2001 From: "Bin.Liu" Date: Fri, 11 Jul 2025 08:56:39 -0500 Subject: [PATCH 2/6] Update submodule ccpp/physics. --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 65a25474e..d033868f7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 65a25474e96977737532f86d199c39dc74b5dc28 +Subproject commit d033868f75d1225a64f2a0fc0e2674ad94f413fd From 4e4b2aa1ca53957746e42b777f3fa0b22aefa10f Mon Sep 17 00:00:00 2001 From: "Bin.Liu" Date: Sat, 19 Jul 2025 10:17:10 -0500 Subject: [PATCH 3/6] From @JongilHan66: GFS_typedefs.F90 and GFS_typedefs.meta are updated to include TTE-EDMF, which can be used in combination with sa3dtke and use_lpt. Update submodules: fv3/atmos_cubed_sphere and ccpp/physics. --- ccpp/data/GFS_typedefs.F90 | 21 +++++++++++++-------- ccpp/data/GFS_typedefs.meta | 6 ++++++ ccpp/physics | 2 +- fv3/atmos_cubed_sphere | 2 +- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 9ef11201b..6bf6d75bb 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -169,11 +169,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 @@ -1183,6 +1183,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 :: dspheat !< flag for tke dissipative heating @@ -1809,7 +1811,6 @@ module GFS_typedefs real (kind=kind_phys), pointer :: dku3d_h (:,:) => null() !< Horizontal eddy diffusitivity for momentum real (kind=kind_phys), pointer :: dku3d_e (:,:) => null() !< Eddy diffusitivity for momentum for tke - !--- dynamical forcing variables for Grell-Freitas convection real (kind=kind_phys), pointer :: forcet (:,:) => null() !< real (kind=kind_phys), pointer :: forceq (:,:) => null() !< @@ -2285,21 +2286,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 @@ -3755,6 +3756,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & 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 :: dspheat = .false. !< flag for tke dissipative heating @@ -4174,7 +4177,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & 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, & @@ -5027,6 +5030,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%redrag = redrag Model%hybedmf = hybedmf Model%satmedmf = satmedmf + Model%tte_edmf = tte_edmf Model%shinhong = shinhong Model%do_ysu = do_ysu Model%dspheat = dspheat @@ -6929,6 +6933,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/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 0037163db..dda4464db 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -5447,6 +5447,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 diff --git a/ccpp/physics b/ccpp/physics index d033868f7..7a341b802 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit d033868f75d1225a64f2a0fc0e2674ad94f413fd +Subproject commit 7a341b8022bc234bec1751a5b911a630955cb7f9 diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index fc06b5cc1..a6fba32ca 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit fc06b5cc136c0f04ccaadbfe969376e309d1f8c0 +Subproject commit a6fba32cae791f95e02bf06deff36dbadaed6b23 From 4932362b8f22647d13b5df0ea57688fbd0ec58c8 Mon Sep 17 00:00:00 2001 From: "Bin.Liu" Date: Mon, 28 Jul 2025 13:01:03 -0500 Subject: [PATCH 4/6] Update submodules: fv3/atmos_cubed_sphere and ccpp/physics, which have 3DTKE related updates from @JongilHan66. --- ccpp/physics | 2 +- fv3/atmos_cubed_sphere | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccpp/physics b/ccpp/physics index 7a341b802..b38592699 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7a341b8022bc234bec1751a5b911a630955cb7f9 +Subproject commit b385926991709ec4719fb65b47ef8e6ca0b02c3d diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index a6fba32ca..3370a8809 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit a6fba32cae791f95e02bf06deff36dbadaed6b23 +Subproject commit 3370a880983abf8086715e0867506f521cb7a30f From 2bc91474394c3fd114efb00bb424af2e451fca5e Mon Sep 17 00:00:00 2001 From: "Bin.Liu" Date: Thu, 7 Aug 2025 11:11:53 -0500 Subject: [PATCH 5/6] Update submodule fv3/atmos_cubed_sphere. --- fv3/atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index 3370a8809..d35735dfe 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 3370a880983abf8086715e0867506f521cb7a30f +Subproject commit d35735dfe3c07cee114b1a757bb6fcc39e34dbee From e5ce938070a813ce7286d2dd3d121bb46861584b Mon Sep 17 00:00:00 2001 From: "Bin.Liu" Date: Mon, 8 Sep 2025 09:59:13 -0500 Subject: [PATCH 6/6] Update submodules of fv3/atmos_cubed_sphere and ccpp/physics. --- .gitmodules | 12 ++++-------- ccpp/physics | 2 +- fv3/atmos_cubed_sphere | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index ecb2b8514..a773677e6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,19 +1,15 @@ [submodule "fv3/atmos_cubed_sphere"] path = fv3/atmos_cubed_sphere - url = https://github.com/hafs-community/GFDL_atmos_cubed_sphere - branch = feature/3dtke_update -# url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere -# branch = dev/emc + url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere + branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/hafs-community/ccpp-physics - branch = feature/3dtke_update -# url = https://github.com/ufs-community/ccpp-physics -# branch = ufs/dev + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index cb519be78..8ceb5b2f1 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit cb519be7849084b5eb99eb5cba5c04f787e6d242 +Subproject commit 8ceb5b2f1fb701474c302928bdd4a8208a7a1c9d diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index 462195b3f..0579acce2 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 462195b3f221b8f2936e79cd8a22eebfde31a1f9 +Subproject commit 0579acce28c95913a2f6d773fd8207172390159a