From 2331ab1a9fba3eff344b71b0370b4ecf1edfe531 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Thu, 2 Mar 2023 18:27:33 +0000 Subject: [PATCH 1/7] add nssl_alphar, nssl_ehw0_in, nssl_ehlw0_in to namelist entries for ensemble perturbationsons --- .gitmodules | 6 ++++-- ccpp/data/GFS_typedefs.F90 | 13 +++++++++++++ ccpp/data/GFS_typedefs.meta | 21 +++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..6dfc750d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev +# url = https://github.com/ufs-community/ccpp-physics +# branch = ufs/dev + url = https://github.com/Jili-Dong/community-ccpp-physics + branch = rrfs_dev [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 8dd562b14..60a26525f 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -884,6 +884,9 @@ module GFS_typedefs real(kind=kind_phys) :: nssl_cccn !< CCN concentration (m-3) real(kind=kind_phys) :: nssl_alphah !< graupel shape parameter real(kind=kind_phys) :: nssl_alphahl !< hail shape parameter + real(kind=kind_phys) :: nssl_alphar ! shape parameter for rain (imurain=1 only) + real(kind=kind_phys) :: nssl_ehw0_in ! constant or max assumed graupel-droplet collection efficiency + real(kind=kind_phys) :: nssl_ehlw0_in! constant or max assumed hail-droplet collection efficiency logical :: nssl_hail_on !< NSSL flag to activate the hail category logical :: nssl_ccn_on !< NSSL flag to activate the CCN category logical :: nssl_invertccn !< NSSL flag to treat CCN as activated (true) or unactivated (false) @@ -3100,6 +3103,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & real(kind=kind_phys) :: nssl_cccn = 0.6e9 !< CCN concentration (m-3) real(kind=kind_phys) :: nssl_alphah = 0.0 !< graupel shape parameter real(kind=kind_phys) :: nssl_alphahl = 1.0 !< hail shape parameter + real(kind=kind_phys) :: nssl_alphar = 0.0 ! shape parameter for rain (imurain=1 only) + real(kind=kind_phys) :: nssl_ehw0_in = 0.9 ! constant or max assumed graupel-droplet collection efficiency + real(kind=kind_phys) :: nssl_ehlw0_in = 0.9 ! constant or max assumed hail-droplet collection efficiency logical :: nssl_hail_on = .false. !< NSSL flag to activate the hail category logical :: nssl_ccn_on = .true. !< NSSL flag to activate the CCN category logical :: nssl_invertccn = .true. !< NSSL flag to treat CCN as activated (true) or unactivated (false) @@ -3525,6 +3531,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & ext_diag_thompson, dt_inner, lgfdlmprad, & sedi_semi, decfl, & nssl_cccn, nssl_alphah, nssl_alphahl, & + nssl_alphar, nssl_ehw0_in, nssl_ehlw0_in, & nssl_invertccn, nssl_hail_on, nssl_ccn_on, & !--- max hourly avg_max_length, & @@ -4059,6 +4066,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%nssl_cccn = nssl_cccn Model%nssl_alphah = nssl_alphah Model%nssl_alphahl = nssl_alphahl + Model%nssl_alphar = nssl_alphar + Model%nssl_ehw0_in = nssl_ehw0_in + Model%nssl_ehlw0_in = nssl_ehlw0_in Model%nssl_hail_on = nssl_hail_on Model%nssl_ccn_on = nssl_ccn_on Model%nssl_invertccn = nssl_invertccn @@ -5895,6 +5905,9 @@ subroutine control_print(Model) print *, ' nssl_cccn - CCCN background CCN conc. : ', Model%nssl_cccn print *, ' nssl_alphah - graupel shape parameter : ', Model%nssl_alphah print *, ' nssl_alphahl - hail shape parameter : ', Model%nssl_alphahl + print *, ' nssl_alphar - rain shape parameter : ', Model%nssl_alphar + print *, ' nssl_ehw0_in - graupel-droplet collection effiency : ', Model%nssl_ehw0_in + print *, ' nssl_ehlw0_in - hail-droplet collection effiency : ', Model%nssl_ehlw0_in print *, ' nssl_hail_on - hail activation flag : ', Model%nssl_hail_on print *, ' lradar - radar refl. flag : ', Model%lradar print *, ' lrefres : ', Model%lrefres diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index c41afa9fb..df8fc5f77 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -3850,6 +3850,27 @@ dimensions = () type = real kind = kind_phys +[nssl_alphar] + standard_name = nssl_alpha_rain + long_name = rain PSD shape parameter in NSSL micro + units = none + dimensions = () + type = real + kind = kind_phys +[nssl_ehw0_in] + standard_name = nssl_hw_collec_eff + long_name = graupel droplet collection efficiency in NSSL micro + units = none + dimensions = () + type = real + kind = kind_phys +[nssl_ehlw0_in] + standard_name = nssl_hlw_collec_eff + long_name = graupel droplet collection efficiency in NSSL micro + units = none + dimensions = () + type = real + kind = kind_phys [nssl_ccn_on] standard_name = nssl_ccn_on long_name = CCN activation flag in NSSL micro From 44e6f37c2eefe53a8ea3b0049a6831bd52945fe6 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Thu, 2 Mar 2023 18:37:36 +0000 Subject: [PATCH 2/7] update ccpp/physics submodule to rrfs_dev branch --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 235ef9675..710b9e174 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 235ef9675ccc986876650afaa811111a91872bb6 +Subproject commit 710b9e174571659b77ac3ebaf9f3b60773474b98 From d2fdeaa3037ad23ee995eb36f9ebd2fe7e0bd9a3 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Fri, 3 Mar 2023 02:05:46 +0000 Subject: [PATCH 3/7] point ccpp/physics to correct hash --- .gitmodules | 10 ++++------ ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6dfc750d0..0c8791110 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,13 +6,11 @@ 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/Jili-Dong/community-ccpp-physics - branch = rrfs_dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP branch = develop +[submodule "ccpp/physics"] + path = ccpp/physics + url = https://github.com/Jili-Dong/community-ccpp-physics.git + branch = rrfs_dev diff --git a/ccpp/physics b/ccpp/physics index 710b9e174..6153f774c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 710b9e174571659b77ac3ebaf9f3b60773474b98 +Subproject commit 6153f774cb0f93eb152092fa47164cff2289c4eb From 2a542e01e57f66cc3e5e1aa0f49f9093323b1e47 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Tue, 7 Mar 2023 14:46:22 +0000 Subject: [PATCH 4/7] update the standard name for hail/graupel collection efficiency --- ccpp/data/GFS_typedefs.meta | 6 +++--- ccpp/physics | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index edd955e47..d08cbb09f 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -3955,15 +3955,15 @@ type = real kind = kind_phys [nssl_ehw0_in] - standard_name = nssl_hw_collec_eff + standard_name = nssl_graupel_collection_efficiency long_name = graupel droplet collection efficiency in NSSL micro units = none dimensions = () type = real kind = kind_phys [nssl_ehlw0_in] - standard_name = nssl_hlw_collec_eff - long_name = graupel droplet collection efficiency in NSSL micro + standard_name = nssl_hail_collection_efficiency + long_name = hail droplet collection efficiency in NSSL micro units = none dimensions = () type = real diff --git a/ccpp/physics b/ccpp/physics index 6153f774c..466ed779b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 6153f774cb0f93eb152092fa47164cff2289c4eb +Subproject commit 466ed779b1da0d00ed489c077d5ef0ae0c89264e From a93113f818824b9e9f1c429fd5d2f4784bcfe1c7 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Tue, 7 Mar 2023 15:04:14 +0000 Subject: [PATCH 5/7] update the long names for parameters related to NSSL microphysics --- ccpp/data/GFS_typedefs.meta | 16 ++++++++-------- ccpp/physics | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index d08cbb09f..f6a426c43 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -3935,54 +3935,54 @@ kind = kind_phys [nssl_alphah] standard_name = nssl_alpha_graupel - long_name = graupel PSD shape parameter in NSSL micro + long_name = graupel particle size distribution(PSD) shape parameter in NSSL microphysics scheme units = none dimensions = () type = real kind = kind_phys [nssl_alphahl] standard_name = nssl_alpha_hail - long_name = hail PSD shape parameter in NSSL micro + long_name = hail particle size distribution(PSD) shape parameter in NSSL microphysics scheme units = none dimensions = () type = real kind = kind_phys [nssl_alphar] standard_name = nssl_alpha_rain - long_name = rain PSD shape parameter in NSSL micro + long_name = rain particle size distribution(PSD) shape parameter in NSSL microphysics scheme units = none dimensions = () type = real kind = kind_phys [nssl_ehw0_in] standard_name = nssl_graupel_collection_efficiency - long_name = graupel droplet collection efficiency in NSSL micro + long_name = graupel droplet collection efficiency in NSSL microphysics scheme units = none dimensions = () type = real kind = kind_phys [nssl_ehlw0_in] standard_name = nssl_hail_collection_efficiency - long_name = hail droplet collection efficiency in NSSL micro + long_name = hail droplet collection efficiency in NSSL microphysics scheme units = none dimensions = () type = real kind = kind_phys [nssl_ccn_on] standard_name = nssl_ccn_on - long_name = CCN activation flag in NSSL micro + long_name = CCN activation flag in NSSL microphysics scheme units = flag dimensions = () type = logical [nssl_hail_on] standard_name = nssl_hail_on - long_name = hail activation flag in NSSL micro + long_name = hail activation flag in NSSL microphysics scheme units = flag dimensions = () type = logical [nssl_invertccn] standard_name = nssl_invertccn - long_name = flag to invert CCN in NSSL micro + long_name = flag to invert CCN in NSSL microphysics scheme units = flag dimensions = () type = logical diff --git a/ccpp/physics b/ccpp/physics index 466ed779b..229c9231e 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 466ed779b1da0d00ed489c077d5ef0ae0c89264e +Subproject commit 229c9231ee4c5467e2aca8f5ef1557995fda5c0a From 599c79b788a08caa61e06ef8a60834e466be9067 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 13 Mar 2023 13:18:59 -0400 Subject: [PATCH 6/7] update ccpp/physics and ccpp/framework submodule pointers and point .gitmodules to to Grant's combo ccpp/physics branch --- .gitmodules | 4 ++-- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0c8791110..e452e32a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,5 +12,5 @@ branch = develop [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/Jili-Dong/community-ccpp-physics.git - branch = rrfs_dev + url = https://github.com/grantfirl/ccpp-physics + branch = 20230313_combo diff --git a/ccpp/framework b/ccpp/framework index 1b6352fb2..60295ad35 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 1b6352fb24f053b738bde72eed0ddf0b60ec7c0f +Subproject commit 60295ad3578ca01b5ca4214b91dd13bb790fbdfe diff --git a/ccpp/physics b/ccpp/physics index 229c9231e..eb9f64ae1 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 229c9231ee4c5467e2aca8f5ef1557995fda5c0a +Subproject commit eb9f64ae11d4ab9aeb06c656c9f3507171b213b7 From f2867bbab85b5bd83e7bda5a85a04f4355540bba Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 15 Mar 2023 14:45:04 -0400 Subject: [PATCH 7/7] revert .gitmodules and update ccpp/physics submodule pointer --- .gitmodules | 8 ++++---- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index e452e32a5..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,11 +6,11 @@ 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 [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP branch = develop -[submodule "ccpp/physics"] - path = ccpp/physics - url = https://github.com/grantfirl/ccpp-physics - branch = 20230313_combo diff --git a/ccpp/physics b/ccpp/physics index eb9f64ae1..630d37494 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit eb9f64ae11d4ab9aeb06c656c9f3507171b213b7 +Subproject commit 630d37494a9e32690131b0af0ea367886581ecba