From b7835b7b44c2abfafb58a6b3469f636eebf4b219 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 8 Mar 2024 08:59:41 -0700 Subject: [PATCH 1/6] Update .gitmodules and submodule pointer for ccpp-framework for code review and testing --- .gitmodules | 6 ++++-- ccpp/framework | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..aaea29f12 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,10 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = main + #url = https://github.com/NCAR/ccpp-framework + #branch = main + url = https://github.com/climbfuji/ccpp-framework + branch = feature/merge_feature_capgen_into_main_20240308 [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/ufs-community/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index f0b9a18b0..4d8a4d993 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit f0b9a18b005d950cb9b0038fbc827b6b37500f43 +Subproject commit 4d8a4d99361867016d6b76cb5cfd0e5d8610187d From 8eb98261e88a9ac722bd84733b977089e1ff766a Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 8 Mar 2024 09:54:09 -0700 Subject: [PATCH 2/6] Update .gitmodules and submodule pointer for ccpp-physics for code review and testing --- .gitmodules | 6 ++++-- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index aaea29f12..c14eba724 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,8 +10,10 @@ branch = feature/merge_feature_capgen_into_main_20240308 [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/climbfuji/ccpp-physics + branch = feature/fix_units_flashes_per_5min [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/framework b/ccpp/framework index 4d8a4d993..6cdd38a03 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 4d8a4d99361867016d6b76cb5cfd0e5d8610187d +Subproject commit 6cdd38a032d89d0f79c66f37f0c7172e59f135cd diff --git a/ccpp/physics b/ccpp/physics index cc114f40b..e1db7f200 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit cc114f40bef4ca8d19ccd739cbaec3fc829a607c +Subproject commit e1db7f20047f292fa7fe23f47b25fe2c535d1679 From 108e85cb96f63b558386c3d06f206bdf26305fe5 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 8 Mar 2024 09:54:36 -0700 Subject: [PATCH 3/6] In ccpp/data/GFS_typedefs.meta: change units 'flashes 5 min-1' to 'flashes min-1' and update long name to make clear this is per 5 minutes --- ccpp/data/GFS_typedefs.meta | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 497c3c786..98833e217 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -9953,8 +9953,8 @@ kind = kind_phys [ltg1_max] standard_name = lightning_threat_index_1 - long_name = lightning threat index 1 - units = flashes 5 min-1 + long_name = lightning threat index 1 in flashes per 5 minutes + units = flashes min-1 dimensions = (horizontal_loop_extent) type = real kind = kind_phys @@ -9962,8 +9962,8 @@ active = (do_lightning_threat_index_calculations) [ltg2_max] standard_name = lightning_threat_index_2 - long_name = lightning threat index 2 - units = flashes 5 min-1 + long_name = lightning threat index 2 in flashes per 5 minutes + units = flashes min-1 dimensions = (horizontal_loop_extent) type = real kind = kind_phys @@ -9971,8 +9971,8 @@ active = (do_lightning_threat_index_calculations) [ltg3_max] standard_name = lightning_threat_index_3 - long_name = lightning threat index 3 - units = flashes 5 min-1 + long_name = lightning threat index 3 in flashes per 5 minutes + units = flashes min-1 dimensions = (horizontal_loop_extent) type = real kind = kind_phys From 734d81a2815fe64723fcd67113da1df02b71fe7c Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 8 Mar 2024 12:41:44 -0700 Subject: [PATCH 4/6] In ccpp/driver/GFS_diagnostics.F90, scale lightning threat from flashes per minute to flashes per 5 minutes to match diagnostic units --- ccpp/driver/GFS_diagnostics.F90 | 6 ++++++ ccpp/physics | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index 01d49593e..3a3e4a0bc 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -5069,6 +5069,8 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%desc = 'Max Lightning Threat 1' ExtDiag(idx)%unit = 'flashes/(5 min)' ExtDiag(idx)%mod_name = 'gfs_sfc' + ! CCPP physics units are flashes per minute + ExtDiag(idx)%cnvfac = 5.0_kind_phys allocate (ExtDiag(idx)%data(nblks)) do nb = 1,nblks ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%ltg1_max @@ -5080,6 +5082,8 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%desc = 'Max Lightning Threat 2' ExtDiag(idx)%unit = 'flashes/(5 min)' ExtDiag(idx)%mod_name = 'gfs_sfc' + ! CCPP physics units are flashes per minute + ExtDiag(idx)%cnvfac = 5.0_kind_phys allocate (ExtDiag(idx)%data(nblks)) do nb = 1,nblks ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%ltg2_max @@ -5091,6 +5095,8 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%desc = 'Max Lightning Threat 3' ExtDiag(idx)%unit = 'flashes/(5 min)' ExtDiag(idx)%mod_name = 'gfs_sfc' + ! CCPP physics units are flashes per minute + ExtDiag(idx)%cnvfac = 5.0_kind_phys allocate (ExtDiag(idx)%data(nblks)) do nb = 1,nblks ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%ltg3_max diff --git a/ccpp/physics b/ccpp/physics index e1db7f200..26f95141c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e1db7f20047f292fa7fe23f47b25fe2c535d1679 +Subproject commit 26f95141ce3ef4cbc6d78dc9c98eda8dca48466b From 0972de7b2f7e9c924c7820fc5359a61138327b3f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 11 Mar 2024 14:21:38 -0600 Subject: [PATCH 5/6] Fix wrong long names for lightning threat indices in ccpp/data/GFS_typedefs.meta --- ccpp/data/GFS_typedefs.meta | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 98833e217..f7b9239da 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -9953,7 +9953,7 @@ kind = kind_phys [ltg1_max] standard_name = lightning_threat_index_1 - long_name = lightning threat index 1 in flashes per 5 minutes + long_name = lightning threat index 1 units = flashes min-1 dimensions = (horizontal_loop_extent) type = real @@ -9962,7 +9962,7 @@ active = (do_lightning_threat_index_calculations) [ltg2_max] standard_name = lightning_threat_index_2 - long_name = lightning threat index 2 in flashes per 5 minutes + long_name = lightning threat index 2 units = flashes min-1 dimensions = (horizontal_loop_extent) type = real @@ -9971,7 +9971,7 @@ active = (do_lightning_threat_index_calculations) [ltg3_max] standard_name = lightning_threat_index_3 - long_name = lightning threat index 3 in flashes per 5 minutes + long_name = lightning threat index 3 units = flashes min-1 dimensions = (horizontal_loop_extent) type = real From b8ff8dcfa9fff56f45cc7ce93eb14a6893a33a30 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 18 Mar 2024 08:34:33 -0600 Subject: [PATCH 6/6] Revert .gitmodules and update submodule pointers for ccpp-framework and ccpp-physics --- .gitmodules | 12 ++++-------- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index c14eba724..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,16 +4,12 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - #url = https://github.com/NCAR/ccpp-framework - #branch = main - url = https://github.com/climbfuji/ccpp-framework - branch = feature/merge_feature_capgen_into_main_20240308 + 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/climbfuji/ccpp-physics - branch = feature/fix_units_flashes_per_5min + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/framework b/ccpp/framework index 87e6d92e2..f1db41531 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 87e6d92e2ca48a55b66f8810f347b51c70c193c4 +Subproject commit f1db41531c772cc60b71296334e0a9616e8b4a91 diff --git a/ccpp/physics b/ccpp/physics index 2f15ae928..9f4a96bcf 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 2f15ae92802cae11fd0efb902439a084609984f3 +Subproject commit 9f4a96bcfb18c19336e308b41d8c8cb11a347c48