From af5eacfbb7e2252497ff2ea26f47cc5fbe0680ce Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Mon, 25 Aug 2025 15:30:21 +0000 Subject: [PATCH 1/7] Introduce tuning parameter for convective cloud liquid --- .gitmodules | 3 ++- ccpp/data/GFS_typedefs.F90 | 10 +++++++--- ccpp/data/GFS_typedefs.meta | 7 +++++++ ccpp/physics | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index a01232401..e203d5c8d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics + #url = https://github.com/ufs-community/ccpp-physics + url = https://github.com/lisa-bengtsson/ccpp-physics branch = ufs/dev [submodule "upp"] path = upp diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index a5febdbb2..16f9daed8 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -1248,6 +1248,7 @@ module GFS_typedefs !< used in the GWD parameterization - 10 more added if !< GSL orographic drag scheme is used integer :: jcap !< number of spectral wave trancation used only by sascnv shalcnv + real(kind=kind_phys) :: cscale !< tunable parameter for saSAS convective cloud liquid real(kind=kind_phys) :: cs_parm(10) !< tunable parameters for Chikira-Sugiyama convection real(kind=kind_phys) :: flgmin(2) !< [in] ice fraction bounds real(kind=kind_phys) :: cgwf(2) !< multiplication factor for convective GWD @@ -1266,7 +1267,7 @@ module GFS_typedefs real(kind=kind_phys) :: psauras(2) !< [in] auto conversion coeff from ice to snow in ras real(kind=kind_phys) :: prauras(2) !< [in] auto conversion coeff from cloud to rain in ras real(kind=kind_phys) :: wminras(2) !< [in] water and ice minimum threshold for ras - + integer :: seed0 !< random seed for radiation real(kind=kind_phys) :: rbcr !< Critical Richardson Number in the PBL scheme @@ -3854,7 +3855,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & integer :: nmtvr = 14 !< number of topographic variables such as variance etc !< used in the GWD parameterization integer :: jcap = 1 !< number of spectral wave trancation used only by sascnv shalcnv -! real(kind=kind_phys) :: cs_parm(10) = (/5.0,2.5,1.0e3,3.0e3,20.0,-999.,-999.,0.,0.,0./) + real :: cscale = 1 !< tunable parameter for convective cloud liquid (0-1) + ! real(kind=kind_phys) :: cs_parm(10) = (/5.0,2.5,1.0e3,3.0e3,20.0,-999.,-999.,0.,0.,0./) real(kind=kind_phys) :: cs_parm(10) = (/8.0,4.0,1.0e3,3.5e3,20.0,1.0,-999.,1.,0.6,0./) real(kind=kind_phys) :: flgmin(2) = (/0.180,0.220/) !< [in] ice fraction bounds real(kind=kind_phys) :: cgwf(2) = (/0.5d0,0.05d0/) !< multiplication factor for convective GWD @@ -4208,7 +4210,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & hybedmf, satmedmf, sigmab_coldstart, & shinhong, do_ysu, dspheat, lheatstrg, lseaspray, cnvcld, & xr_cnvcld, random_clds, shal_cnv, imfshalcnv, imfdeepcnv, & - isatmedmf, conv_cf_opt, do_deep, jcap, & + isatmedmf, conv_cf_opt, do_deep, jcap, cscale, & cs_parm, flgmin, cgwf, ccwf, cdmbgwd, alpha_fd, & psl_gwd_dx_factor, & sup, ctei_rm, crtrh, & @@ -5088,6 +5090,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%conv_cf_opt = conv_cf_opt Model%nmtvr = nmtvr Model%jcap = jcap + Model%cscale = cscale Model%flgmin = flgmin Model%cgwf = cgwf Model%ccwf = ccwf @@ -6992,6 +6995,7 @@ subroutine control_print(Model) print *, ' conv_cf_opt : ', Model%conv_cf_opt print *, ' nmtvr : ', Model%nmtvr print *, ' jcap : ', Model%jcap + print *, ' cscale : ', Model%cscale print *, ' cs_parm : ', Model%cs_parm print *, ' flgmin : ', Model%flgmin print *, ' cgwf : ', Model%cgwf diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 096d7c4cc..54ac0df51 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -5810,6 +5810,13 @@ units = count dimensions = () type = integer +[cscale] + standard_name = scaling_conv_cloud_water_in_sas + long_name = scaling parameter for conv cloud water + units = none + dimensions = () + type = real + kind = kind_phys [cs_parm(1)] standard_name = updraft_velocity_tunable_parameter_1_CS long_name = tunable parameter 1 for Chikira-Sugiyama convection diff --git a/ccpp/physics b/ccpp/physics index 8292b660e..daf5859e7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8292b660ec9d692577c5490738335341dd4420eb +Subproject commit daf5859e799a581ca34eb358deca84e9387ecdcb From 59eb253fe78745ae4d7047f8faf8842161b2428f Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Wed, 3 Sep 2025 21:09:26 +0000 Subject: [PATCH 2/7] synced ccpp physics with upstream --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index daf5859e7..203dd5520 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit daf5859e799a581ca34eb358deca84e9387ecdcb +Subproject commit 203dd55200c6bb06d9205abb8d2a6237ef3956bf From a5d707f9c9c2960c44b4910727248ba777147a38 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Wed, 3 Sep 2025 22:09:04 +0000 Subject: [PATCH 3/7] Update name in .meta files --- ccpp/data/GFS_typedefs.meta | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 0480521a6..708c375fa 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -5829,8 +5829,8 @@ dimensions = () type = integer [cscale] - standard_name = scaling_conv_cloud_water_in_sas - long_name = scaling parameter for conv cloud water + standard_name = multiplicative_tuning_parameter_for_convective_cloud_water + long_name = multiplicative tuning parameter for convective cloud water units = none dimensions = () type = real diff --git a/ccpp/physics b/ccpp/physics index 203dd5520..78d819cda 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 203dd55200c6bb06d9205abb8d2a6237ef3956bf +Subproject commit 78d819cdaecedbe801ba207dae21d905e47c8d5a From 583957b5ce2dfa9ccc97b07102dbde3da75a7b64 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Thu, 4 Sep 2025 15:55:05 +0000 Subject: [PATCH 4/7] add CI script fix in ccpp physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 78d819cda..c8585498f 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 78d819cdaecedbe801ba207dae21d905e47c8d5a +Subproject commit c8585498fd8b810570bb8c12a9918bc78d1c6dc3 From 20ad63dc375615a979349ca6cdf3de4fec165179 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Mon, 8 Sep 2025 14:25:47 +0000 Subject: [PATCH 5/7] sync with updated ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index c8585498f..fc47f607e 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c8585498fd8b810570bb8c12a9918bc78d1c6dc3 +Subproject commit fc47f607ef19452efb2ac16a15db27392e1d7f36 From edebeb5edcfdc189abe299b0ab89faa4d835ba53 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Wed, 10 Sep 2025 16:15:26 +0000 Subject: [PATCH 6/7] update to ccpp/physics a04a2152 --- .gitmodules | 1 - ccpp/physics | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 380fdc5e9..9071f002a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,6 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/ufs-community/ccpp-physics url = https://github.com/lisa-bengtsson/ccpp-physics branch = ufs/dev [submodule "upp"] diff --git a/ccpp/physics b/ccpp/physics index fc47f607e..a04a21521 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit fc47f607ef19452efb2ac16a15db27392e1d7f36 +Subproject commit a04a215218ecbb1f056df59bf13a898cc6acad59 From e887a7eac0dad7fab009699a00d64a436630fbf4 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Wed, 10 Sep 2025 16:18:18 +0000 Subject: [PATCH 7/7] update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9071f002a..a773677e6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/lisa-bengtsson/ccpp-physics + url = https://github.com/ufs-community/ccpp-physics branch = ufs/dev [submodule "upp"] path = upp