From 4e24cf305ec7bdf7040c8036f63056db8b1a8a6d Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 30 Nov 2022 11:02:13 -0700 Subject: [PATCH 1/3] Switched submodules --- .gitmodules | 4 ++-- ccpp/data/GFS_typedefs.F90 | 14 ++++++++++++-- ccpp/data/GFS_typedefs.meta | 6 ++++++ ccpp/physics | 2 +- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..9eb0b4c5d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/dustinswales/ccpp-physics + branch = ufs-dev-PR9 [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 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 6374c8862..7a5b0818c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 6374c88626fee7de8484b1c6fd3bf2e165265dc5 +Subproject commit 7a5b0818c4eb38082c32eadaa7f8baf479f24adf From 232470f5af50264acd873e7fb335eb3ead954fc1 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Tue, 13 Dec 2022 14:36:28 -0700 Subject: [PATCH 2/3] Updated physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 7a5b0818c..cb2993e58 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7a5b0818c4eb38082c32eadaa7f8baf479f24adf +Subproject commit cb2993e584aedb113afe39bf0e448e750a4c329d From 29d01fd799853c694a8b0b4c28fe02b8581e5995 Mon Sep 17 00:00:00 2001 From: dustinswales Date: Wed, 14 Dec 2022 13:28:04 -0700 Subject: [PATCH 3/3] Revert submodules --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9eb0b4c5d..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/dustinswales/ccpp-physics - branch = ufs-dev-PR9 + 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 cb2993e58..fc1d6217e 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit cb2993e584aedb113afe39bf0e448e750a4c329d +Subproject commit fc1d6217ea6344898a45488bccaf6a3612dbb94d