From f7651747cc61b2d7faa7eca3e1b9a1cdbfca9653 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Mon, 21 Nov 2022 09:59:59 -0700 Subject: [PATCH 1/6] Switch ccpp-physics submodule (#603) * Switch ccpp-physics submodue. * ccpp #17: git action ci yaml update. --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 8c9d446d5..82062de8c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8c9d446d5f294e3eb38f5e91a27450b887e468d9 +Subproject commit 82062de8cabe3e2f6d255f54a1fcce751aa8b7b6 From 086f70de94b9b0d063835cc7727c1d26721e08f7 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 22 Nov 2022 09:33:16 -0700 Subject: [PATCH 2/6] Add convective cloud to radiation, Thompson MP only. (#589) * Add convective cloud to radiation, Thompson MP only. --- ccpp/data/GFS_typedefs.F90 | 14 ++++++++++++-- ccpp/data/GFS_typedefs.meta | 6 ++++++ ccpp/physics | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index f217d1427..41741d236 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -787,8 +787,9 @@ module GFS_typedefs real(kind_phys) :: lfnc_k !< Logistic function transition depth (Pa) real(kind_phys) :: lfnc_p0 !< Logistic function transition level (Pa) logical :: doGP_lwscat !< If true, include scattering in longwave cloud-optics, only compatible w/ GP cloud-optics - logical :: doGP_sgs_cnv !< If true, include SubGridScale convective cloud in RRTMGP - logical :: doGP_sgs_mynn !< If true, include SubGridScale MYNN-EDMF cloud in RRTMGP + logical :: doGP_sgs_cnv !< If true, include explicit SubGridScale convective cloud in RRTMGP + logical :: doGP_sgs_mynn !< If true, include explicit SubGridScale MYNN-EDMF cloud in RRTMGP + logical :: doGP_smearclds !< If true, include implicit SubGridScale clouds in RRTMGP real(kind_phys) :: minGPpres !< Minimum pressure allowed in RRTMGP. real(kind_phys) :: maxGPpres !< Maximum pressure allowed in RRTMGP. real(kind_phys) :: minGPtemp !< Minimum temperature allowed in RRTMGP. @@ -3027,6 +3028,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & logical :: doGP_lwscat = .false. !< If true, include scattering in longwave cloud-optics, only compatible w/ GP cloud-optics logical :: doGP_sgs_cnv = .false. !< If true, include SubGridScale convective cloud in RRTMGP logical :: doGP_sgs_mynn = .false. !< If true, include SubGridScale MYNN-EDMF cloud in RRTMGP + logical :: doGP_smearclds = .true. !< If true, include implicit SubGridScale clouds in RRTMGP !--- Z-C microphysical parameters integer :: imp_physics = 99 !< choice of cloud scheme real(kind=kind_phys) :: psautco(2) = (/6.0d-4,3.0d-4/) !< [in] auto conversion coeff from ice to snow @@ -3947,6 +3949,13 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & write(0,*) "Logic error, RRTMGP flag doGP_sgs_mynn only works with do_mynnedmf=.true." stop endif + if (Model%doGP_sgs_cnv .or. Model%doGP_sgs_mynn) then + write(0,*) "RRTMGP explicit cloud scheme being used." + Model%doGP_smearclds = .false. + else + write(0,*) "RRTMGP implicit cloud scheme being used." + endif + if (Model%doGP_cldoptics_PADE .and. Model%doGP_cldoptics_LUT) then write(0,*) "Logic error, Both RRTMGP cloud-optics options cannot be selected. " stop @@ -5809,6 +5818,7 @@ subroutine control_print(Model) print *, ' doGP_lwscat : ', Model%doGP_lwscat print *, ' doGP_sgs_cnv : ', Model%doGP_sgs_cnv print *, ' doGP_sgs_mynn : ', Model%doGP_sgs_cnv + print *, ' doGP_smearclds : ', Model%doGP_smearclds print *, ' iovr_convcld : ', Model%iovr_convcld endif print *, ' ' diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 503263dbe..42d5ef29e 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -3445,6 +3445,12 @@ units = flag dimensions = () type = logical +[doGP_smearclds] + standard_name = flag_for_implicit_sgs_cloud_in_RRTMGP + long_name = logical flag to impicit SGS cloud in RRTMGP + units = flag + dimensions = () + type = logical [iovr_convcld] standard_name = flag_for_convective_cloud_overlap_method_for_radiation long_name = flag for convective cloud overlap method diff --git a/ccpp/physics b/ccpp/physics index 82062de8c..84d89f9d8 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 82062de8cabe3e2f6d255f54a1fcce751aa8b7b6 +Subproject commit 84d89f9d8e7930544f450ffc3d5e26f238ed8208 From b88f2c8666f72fb9e2bc53ad7853e84211d35392 Mon Sep 17 00:00:00 2001 From: ChunxiZhang-NOAA <49283036+ChunxiZhang-NOAA@users.noreply.github.com> Date: Tue, 29 Nov 2022 10:23:05 -0500 Subject: [PATCH 3/6] Bug fix for the NoahMP scheme (#601) * change fv3atm branch to bugfix/noahmp_hr1 and change ccpp-physics pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 84d89f9d8..18d3fda36 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 84d89f9d8e7930544f450ffc3d5e26f238ed8208 +Subproject commit 18d3fda364e42606e714168dd292e59c001e771a From 8efdef2f3a0c253c769609bb50f7e4dee900bf9e Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 14 Dec 2022 15:45:51 -0500 Subject: [PATCH 4/6] update ccpp/physics submodule pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index ca2a3d9a2..c0e416d23 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit ca2a3d9a2b2db43192320e6b582f1edc595f9cf4 +Subproject commit c0e416d234b768c96e197e5e2f6874a23f4144ec From ac76edb4c4edfa7ccce8d0011ae60612505b7cb3 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 14 Dec 2022 15:46:59 -0500 Subject: [PATCH 5/6] update .gitmodules for testing --- .gitmodules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..590940004 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/grantfirl/ccpp-physics + branch = ufs-dev-PR23 + #url = https://github.com/NCAR/ccpp-physics + #branch = main [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From f2b974f33089ba19645025ce60f391b4c11a5e34 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Fri, 16 Dec 2022 17:00:53 -0500 Subject: [PATCH 6/6] update ccpp/physics submodule pointer and revert .gitmodules --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 590940004..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR23 - #url = https://github.com/NCAR/ccpp-physics - #branch = main + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index c0e416d23..05b168267 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c0e416d234b768c96e197e5e2f6874a23f4144ec +Subproject commit 05b168267a341983f346affc7e060092a35cdc89