From c8dffd0d868fe3ac2e83486995ee5b0c7c6c0f0f Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 1 Apr 2026 17:45:31 -0400 Subject: [PATCH 1/9] point to PR branch of ccpp/physics --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5e5f8d221..233fef932 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = develop [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/grantfirl/ccpp-physics + branch = NCAR-main-sync-20260401 [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index eee1edf1c..750e7cc44 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit eee1edf1c03d5d96abe379c167a1e2dd67a8c136 +Subproject commit 750e7cc446d67be26648059e63fa5b7b47a15fc7 From bda07d784fe672c4ade47cfba8236d5e6d3b26d0 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 1 Apr 2026 17:48:54 -0400 Subject: [PATCH 2/9] fixes to GFS_typedefs.meta from NRL --- 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 a4b1963ee..490a046b1 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -7517,7 +7517,7 @@ dimensions = () type = integer [oz_coeff] - standard_name = number_of_coefficients_in_ozone_data + standard_name = number_of_coefficients_in_ozone_forcing_data long_name = number of coefficients in ozone forcing data units = count dimensions = () @@ -8323,7 +8323,7 @@ standard_name = ozone_forcing long_name = ozone forcing data units = mixed - dimensions = (horizontal_dimension,vertical_dimension_of_ozone_forcing_data,number_of_coefficients_in_ozone_data) + dimensions = (horizontal_dimension,vertical_dimension_of_ozone_forcing_data,number_of_coefficients_in_ozone_forcing_data) type = real kind = kind_phys [h2opl] @@ -10983,7 +10983,7 @@ type = real kind = kind_phys [con_avgd] - standard_name = avogadro_consant + standard_name = avogadro_constant long_name = Avogadro constant units = mol-1 dimensions = () From 7b1f61fb033d5cb347e510f514b87fdcdc90f7bb Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 13 Apr 2026 12:20:50 -0400 Subject: [PATCH 3/9] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index d0b7f9201..d41d8c629 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit d0b7f9201c39aee443ba6d8c80172e641acba83a +Subproject commit d41d8c6294e09e0af6385144128a375bb3943523 From d3332912e2af4ea58531733847d78cc7524c0139 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 29 Apr 2026 18:18:20 +0000 Subject: [PATCH 4/9] send 0 as mpi_root to CCPP for broadcasting without hanging --- fv3/atmos_model.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fv3/atmos_model.F90 b/fv3/atmos_model.F90 index 513cd038c..3edb0b63f 100644 --- a/fv3/atmos_model.F90 +++ b/fv3/atmos_model.F90 @@ -632,7 +632,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step) call get_atmos_tracer_types(tracer_types) !--- setup Init_parm Init_parm%me = mpp_pe() - Init_parm%master = mpp_root_pe() + Init_parm%master = 0 Init_parm%fcst_mpi_comm = fcst_mpi_comm Init_parm%fcst_ntasks = fcst_ntasks Init_parm%tile_num = tile_num From 7580142213793535f63c0f4a9875abcb517f362e Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 15 Jan 2026 09:19:55 -0700 Subject: [PATCH 5/9] Add RRTMGP initialization flags and revert hardcoding of mpiroot. (#17) Add RRTMGP initialization flags and revert hardcoding of mpiroot. --- ccpp/data/GFS_typedefs.F90 | 4 ++++ ccpp/data/GFS_typedefs.meta | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index c719a8f04..ee8a222be 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -980,6 +980,10 @@ module GFS_typedefs logical :: top_at_1 !< Vertical ordering flag. integer :: iSFC !< Vertical index for surface integer :: iTOA !< Vertical index for TOA + logical :: is_init_lw_gas_optics = .false. + logical :: is_init_sw_gas_optics = .false. + logical :: is_init_lw_cloud_optics = .false. + logical :: is_init_sw_cloud_optics = .false. !--- microphysical switch logical :: convert_dry_rho = .true. !< flag for converting mass/number concentrations from moist to dry diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index c2f1b4f5e..4d884219c 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -4578,6 +4578,30 @@ units = flag dimensions = () type = integer +[is_init_sw_gas_optics] + standard_name = flag_for_rrmtgp_sw_gas_optics_initialization + long_name = flag carrying scheme initialization status + units = flag + dimensions = () + type = logical +[is_init_sw_cloud_optics] + standard_name = flag_for_rrmtgp_sw_cloud_optics_initialization + long_name = flag carrying scheme initialization status + units = flag + dimensions = () + type = logical +[is_init_lw_gas_optics] + standard_name = flag_for_rrmtgp_lw_gas_optics_initialization + long_name = flag carrying scheme initialization status + units = flag + dimensions = () + type = logical +[is_init_lw_cloud_optics] + standard_name = flag_for_rrmtgp_lw_cloud_optics_initialization + long_name = flag carrying scheme initialization status + units = flag + dimensions = () + type = logical [convert_dry_rho] standard_name = flag_for_converting_hydrometeors_from_moist_to_dry_air long_name = flag for converting hydrometeors from moist to dry air From 756e158a71fbe9ab3d172af5d6a56d66f38aa54d Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Fri, 1 May 2026 21:27:49 +0000 Subject: [PATCH 6/9] update ccpp submodule --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index e2a12229b..24730c91c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e2a12229ba8a7f9246353ab2f92643a6cb1aaa89 +Subproject commit 24730c91c00d1d013b217913e37ca1ca75590482 From b83a7b661e08e7a3e3ed951194776afc4eea985b Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 6 May 2026 14:23:27 +0000 Subject: [PATCH 7/9] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 24730c91c..37ad15780 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 24730c91c00d1d013b217913e37ca1ca75590482 +Subproject commit 37ad15780e142a295e1d80deca9083c91506f408 From f921562dc5061fbbf159d86357dfc90cf06c444d Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 7 May 2026 09:58:02 -0400 Subject: [PATCH 8/9] add comments for new init flags --- ccpp/data/GFS_typedefs.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index ee8a222be..c3816ba2f 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -980,10 +980,10 @@ module GFS_typedefs logical :: top_at_1 !< Vertical ordering flag. integer :: iSFC !< Vertical index for surface integer :: iTOA !< Vertical index for TOA - logical :: is_init_lw_gas_optics = .false. - logical :: is_init_sw_gas_optics = .false. - logical :: is_init_lw_cloud_optics = .false. - logical :: is_init_sw_cloud_optics = .false. + logical :: is_init_lw_gas_optics = .false. !< flag to denote whether LW radiation gas optics have been initialized + logical :: is_init_sw_gas_optics = .false. !< flag to denote whether SW radiation gas optics have been initialized + logical :: is_init_lw_cloud_optics = .false. !< flag to denote whether LW radiation cloud optics have been initialized + logical :: is_init_sw_cloud_optics = .false. !< flag to denote whether SW radiation cloud optics have been initialized !--- microphysical switch logical :: convert_dry_rho = .true. !< flag for converting mass/number concentrations from moist to dry From 3e8b7f61545f9538958e62494745847e2415bac5 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 11 May 2026 09:47:31 -0400 Subject: [PATCH 9/9] update ccpp/physics after its merge --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 233fef932..5e5f8d221 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +8,8 @@ branch = develop [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/ufs-community/ccpp-physics - #branch = ufs/dev - url = https://github.com/grantfirl/ccpp-physics - branch = NCAR-main-sync-20260401 + 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/physics b/ccpp/physics index 37ad15780..bab504075 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 37ad15780e142a295e1d80deca9083c91506f408 +Subproject commit bab5040758c0f1f29a201022ce4c1d3c49844440