From fb0c50acb2c1a6e3ef5fd644b245ff8b7311646d Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Thu, 1 Jun 2023 13:26:54 +0000 Subject: [PATCH 1/6] change ccpp-physics path --- .gitmodules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..0457b7249 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/MicroTed/ccpp-physics.git + branch = ufs-dev-tm [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From 9dca23ae2aff023fa58d451baaa76587486564ed Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Thu, 1 Jun 2023 13:32:22 +0000 Subject: [PATCH 2/6] update ccpp-physics to the latest commit --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 3a306a493..b4e549959 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3a306a493a9a0b6c3c39c7b50d356f0ddb7c5c94 +Subproject commit b4e5499590d46a9c80b764755cb4792317f41cbb From 388b2424f5053bcde5ba8758db5abd6dde487616 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Thu, 1 Jun 2023 13:55:09 +0000 Subject: [PATCH 3/6] name change for two NSSL MP namelist parameters --- ccpp/data/GFS_typedefs.F90 | 20 ++++++++++---------- ccpp/data/GFS_typedefs.meta | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index d831942f2..1b4e36f02 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -970,9 +970,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 + real(kind=kind_phys) :: nssl_alphar ! shape parameter for rain (imurain=1 only) + real(kind=kind_phys) :: nssl_ehw0 ! constant or max assumed graupel-droplet collection efficiency + real(kind=kind_phys) :: nssl_ehlw0 ! 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) @@ -3416,8 +3416,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & 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 + real(kind=kind_phys) :: nssl_ehw0 = 0.9 ! constant or max assumed graupel-droplet collection efficiency + real(kind=kind_phys) :: nssl_ehlw0 = 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) @@ -3879,7 +3879,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_alphar, nssl_ehw0, nssl_ehlw0, & nssl_invertccn, nssl_hail_on, nssl_ccn_on, & !--- max hourly avg_max_length, & @@ -4471,8 +4471,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & 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_ehw0 = nssl_ehw0 + Model%nssl_ehlw0 = nssl_ehlw0 Model%nssl_hail_on = nssl_hail_on Model%nssl_ccn_on = nssl_ccn_on Model%nssl_invertccn = nssl_invertccn @@ -6411,8 +6411,8 @@ subroutine control_print(Model) 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_ehw0 - graupel-droplet collection effiency : ', Model%nssl_ehw0 + print *, ' nssl_ehlw0 - hail-droplet collection effiency : ', Model%nssl_ehlw0 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 4ab11dd4c..933c45ebd 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -4322,14 +4322,14 @@ dimensions = () type = real kind = kind_phys -[nssl_ehw0_in] +[nssl_ehw0] standard_name = nssl_graupel_collection_efficiency long_name = graupel droplet collection efficiency in NSSL microphysics scheme units = none dimensions = () type = real kind = kind_phys -[nssl_ehlw0_in] +[nssl_ehlw0] standard_name = nssl_hail_collection_efficiency long_name = hail droplet collection efficiency in NSSL microphysics scheme units = none From efad0096fff5e12359a1f28d4e86865d814a612f Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Fri, 2 Jun 2023 19:55:13 +0000 Subject: [PATCH 4/6] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index b4e549959..b3ad1dc9b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit b4e5499590d46a9c80b764755cb4792317f41cbb +Subproject commit b3ad1dc9bfb1d490b8a2db68db534cddc917bf30 From ca791911b104d0e30bdf9b356d28ba1590ccc39b Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Wed, 5 Jul 2023 13:54:01 +0000 Subject: [PATCH 5/6] revert ccpp/physics submodule --- .gitmodules | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0457b7249..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics -# url = https://github.com/ufs-community/ccpp-physics -# branch = ufs/dev - url = https://github.com/MicroTed/ccpp-physics.git - branch = ufs-dev-tm + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From ab00f1c5a2856dd3f2241ff94db0031e56d97ed8 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Wed, 5 Jul 2023 14:02:02 +0000 Subject: [PATCH 6/6] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 99f0f06ec..c90c3d11e 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 99f0f06ec1e00669f3c0504559b8ae85398b080b +Subproject commit c90c3d11e18cf495a4ca35dc2806482cbce11191