From f2622f65c64bf62b9376aada063e88dd898b4ac7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 13 Mar 2025 11:59:02 -0600 Subject: [PATCH 1/7] Split group physics into physics_process_split and physics_time_split in all suites, update driver/CCPP_driver.F90 accordingly --- ccpp/driver/CCPP_driver.F90 | 65 ++++++++++++++----- ...suite_FV3_GFS_v15_thompson_mynn_lam3km.xml | 6 +- ccpp/suites/suite_FV3_GFS_v15p2.xml | 6 +- ccpp/suites/suite_FV3_GFS_v16.xml | 6 +- ccpp/suites/suite_FV3_GFS_v16_csawmg.xml | 6 +- ccpp/suites/suite_FV3_GFS_v16_flake.xml | 6 +- ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml | 6 +- ccpp/suites/suite_FV3_GFS_v16_ras.xml | 6 +- ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml | 6 +- .../suite_FV3_GFS_v17_coupled_p8_c3.xml | 6 +- .../suite_FV3_GFS_v17_coupled_p8_sfcocn.xml | 6 +- .../suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml | 6 +- ccpp/suites/suite_FV3_GFS_v17_p8.xml | 6 +- ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml | 6 +- ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml | 6 +- ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml | 6 +- ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml | 6 +- .../suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml | 6 +- .../suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml | 6 +- ccpp/suites/suite_FV3_HAFS_v1_thompson.xml | 6 +- .../suite_FV3_HAFS_v1_thompson_nonsst.xml | 6 +- ...uite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml | 6 +- ccpp/suites/suite_FV3_HRRR.xml | 6 +- ccpp/suites/suite_FV3_HRRR_c3.xml | 6 +- ccpp/suites/suite_FV3_HRRR_gf.xml | 6 +- ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml | 6 +- ccpp/suites/suite_FV3_RAP.xml | 6 +- ccpp/suites/suite_FV3_RAP_cires_ugwp.xml | 6 +- ccpp/suites/suite_FV3_RAP_clm_lake.xml | 6 +- ccpp/suites/suite_FV3_RAP_flake.xml | 6 +- ccpp/suites/suite_FV3_RAP_noah.xml | 6 +- .../suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml | 6 +- ccpp/suites/suite_FV3_RAP_sfcdiff.xml | 6 +- ccpp/suites/suite_FV3_RAP_unified_ugwp.xml | 6 +- ccpp/suites/suite_FV3_RRFS_v1beta.xml | 6 +- ccpp/suites/suite_FV3_RRFS_v1nssl.xml | 6 +- ccpp/suites/suite_FV3_WoFS_v0.xml | 6 +- ccpp/suites/suite_FV3_global_nest_v1.xml | 6 +- ccpp/suites/suite_RRFS_sas.xml | 6 +- ccpp/suites/suite_RRFS_sas_nogwd.xml | 6 +- ccpp/suites/suite_RRFSens_phy1.xml | 6 +- ccpp/suites/suite_RRFSens_phy2.xml | 6 +- ccpp/suites/suite_RRFSens_phy3.xml | 6 +- ccpp/suites/suite_RRFSens_phy4.xml | 6 +- ccpp/suites/suite_RRFSens_phy5.xml | 6 +- 45 files changed, 270 insertions(+), 59 deletions(-) diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90 index 065e97ef9..2c8b14aee 100644 --- a/ccpp/driver/CCPP_driver.F90 +++ b/ccpp/driver/CCPP_driver.F90 @@ -132,14 +132,22 @@ subroutine CCPP_step (step, nblks, ierr) return end if - ! call timestep_init for "physics"---required for Land IAU - call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="physics", ierr=ierr) + ! call timestep_init for "physics_process_split"---required for Land IAU + call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="physics_process_split", ierr=ierr) if (ierr/=0) then - write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group physics" + write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group physics_process_split" write(0,'(a)') trim(cdata_domain%errmsg) return - end if - + end if + + ! call timestep_init for "physics_time_split"---required for Land IAU + call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="physics_time_split", ierr=ierr) + if (ierr/=0) then + write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group physics_time_split" + write(0,'(a)') trim(cdata_domain%errmsg) + return + end if + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! DH* 20210104 - this block of code will be removed once the CCPP framework ! ! fully supports handling diagnostics through its metadata, work in progress ! @@ -194,12 +202,31 @@ subroutine CCPP_step (step, nblks, ierr) ntX = nt end if !--- Call CCPP radiation/physics/stochastics group - call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name=trim(step), ierr=ierr2) - if (ierr2/=0) then - write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", trim(step), & - ", block/chunk ", nb, " and thread ", nt, " (ntX=", ntX, "):" - write(0,'(a)') trim(cdata_block(nb,ntX)%errmsg) - ierr = ierr + ierr2 + if (trim(step)=="physics") then + ! Process-split physics + call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="physics_process_split"), ierr=ierr2) + if (ierr2/=0) then + write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "physics_process_split"), & + ", block/chunk ", nb, " and thread ", nt, " (ntX=", ntX, "):" + write(0,'(a)') trim(cdata_block(nb,ntX)%errmsg) + ierr = ierr + ierr2 + endif + ! Time-split physics + call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="physics_time_split"), ierr=ierr2) + if (ierr2/=0) then + write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "physics_time_split"), & + ", block/chunk ", nb, " and thread ", nt, " (ntX=", ntX, "):" + write(0,'(a)') trim(cdata_block(nb,ntX)%errmsg) + ierr = ierr + ierr2 + endif + else + call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name=trim(step), ierr=ierr2) + if (ierr2/=0) then + write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", trim(step), & + ", block/chunk ", nb, " and thread ", nt, " (ntX=", ntX, "):" + write(0,'(a)') trim(cdata_block(nb,ntX)%errmsg) + ierr = ierr + ierr2 + endif end if end do !$OMP end do @@ -222,13 +249,21 @@ subroutine CCPP_step (step, nblks, ierr) return end if - ! call timestep_finalize for "physics"---required for Land IAU - call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="physics", ierr=ierr) + ! call timestep_finalize for "physics_process_split"---required for Land IAU + call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="physics_process_split", ierr=ierr) if (ierr/=0) then - write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group physics" + write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group physics_process_split" write(0,'(a)') trim(cdata_domain%errmsg) return - end if + end if + + ! call timestep_finalize for "physics_time_split"---required for Land IAU + call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="physics_time_split", ierr=ierr) + if (ierr/=0) then + write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group physics_time_split" + write(0,'(a)') trim(cdata_domain%errmsg) + return + end if ! Physics finalize else if (trim(step)=="physics_finalize") then diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml index 3b93422b5..2921d3ed2 100644 --- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -59,6 +59,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v15p2.xml b/ccpp/suites/suite_FV3_GFS_v15p2.xml index bd7225019..182515584 100644 --- a/ccpp/suites/suite_FV3_GFS_v15p2.xml +++ b/ccpp/suites/suite_FV3_GFS_v15p2.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -65,6 +65,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v16.xml b/ccpp/suites/suite_FV3_GFS_v16.xml index 37de8fbc5..3d07a56a9 100644 --- a/ccpp/suites/suite_FV3_GFS_v16.xml +++ b/ccpp/suites/suite_FV3_GFS_v16.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -65,6 +65,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml b/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml index 907a0234c..14c10d8f1 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,6 +60,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_flake.xml b/ccpp/suites/suite_FV3_GFS_v16_flake.xml index c11b2afdf..54b04bf0f 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_flake.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_flake.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -66,6 +66,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml b/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml index e10022121..558140fbf 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,6 +58,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_ras.xml b/ccpp/suites/suite_FV3_GFS_v16_ras.xml index 0545de59a..14359e0d3 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_ras.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_ras.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -65,6 +65,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml index 7d97c67b1..6124eff22 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,6 +62,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml index bba0f5b78..0cae1a8d5 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,6 +61,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml index 3d25ec17b..8f425e2a1 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -59,6 +59,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml index 134fe7b9d..49c7adce6 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,6 +62,10 @@ ugwpv1_gsldrag_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8.xml b/ccpp/suites/suite_FV3_GFS_v17_p8.xml index 58f9431a8..137713934 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,6 +61,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml index 54258c15e..466be2f73 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,6 +62,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml index e54c3ab06..63bb2b2b6 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -63,6 +63,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml index 1bbd34def..7695b6440 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml @@ -24,7 +24,7 @@ GFS_rrtmgp_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,6 +61,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml index 5ceab7c64..ac2e9af85 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,6 +61,10 @@ ugwpv1_gsldrag_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml index db918c643..26a43113e 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -65,6 +65,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml index f2a02001e..b295c4060 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -63,6 +63,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml index 6a043e897..56c070dcf 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,6 +60,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml index 5408b3898..f0fc23557 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,6 +58,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml index 6283e3a3f..eaf4de4df 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,6 +60,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_HRRR.xml b/ccpp/suites/suite_FV3_HRRR.xml index fabe94665..bcbae2812 100644 --- a/ccpp/suites/suite_FV3_HRRR.xml +++ b/ccpp/suites/suite_FV3_HRRR.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,6 +58,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_HRRR_c3.xml b/ccpp/suites/suite_FV3_HRRR_c3.xml index c0f3ec1f5..285d7533e 100644 --- a/ccpp/suites/suite_FV3_HRRR_c3.xml +++ b/ccpp/suites/suite_FV3_HRRR_c3.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,6 +58,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_HRRR_gf.xml b/ccpp/suites/suite_FV3_HRRR_gf.xml index f3f227106..aaa57f0a6 100644 --- a/ccpp/suites/suite_FV3_HRRR_gf.xml +++ b/ccpp/suites/suite_FV3_HRRR_gf.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,6 +58,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml index 6b01cbd79..41b95d562 100644 --- a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml +++ b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -55,6 +55,10 @@ mynnedmf_wrapper rrfs_smoke_postpbl GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_RAP.xml b/ccpp/suites/suite_FV3_RAP.xml index c2243e3fa..81c43f661 100644 --- a/ccpp/suites/suite_FV3_RAP.xml +++ b/ccpp/suites/suite_FV3_RAP.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,6 +58,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml index 7760b059c..0d696c402 100644 --- a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -59,6 +59,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_RAP_clm_lake.xml b/ccpp/suites/suite_FV3_RAP_clm_lake.xml index d794cd74a..0b34664a1 100644 --- a/ccpp/suites/suite_FV3_RAP_clm_lake.xml +++ b/ccpp/suites/suite_FV3_RAP_clm_lake.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -59,6 +59,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_RAP_flake.xml b/ccpp/suites/suite_FV3_RAP_flake.xml index 652071989..767f99765 100644 --- a/ccpp/suites/suite_FV3_RAP_flake.xml +++ b/ccpp/suites/suite_FV3_RAP_flake.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -59,6 +59,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_RAP_noah.xml b/ccpp/suites/suite_FV3_RAP_noah.xml index 7311eb989..3ca2074dd 100644 --- a/ccpp/suites/suite_FV3_RAP_noah.xml +++ b/ccpp/suites/suite_FV3_RAP_noah.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -59,6 +59,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml index 229ebc08f..6a49729ce 100644 --- a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,6 +60,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml index 7c2908a25..04d6e47cc 100644 --- a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml +++ b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,6 +58,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml index 6913b8e4a..1ba45be0d 100644 --- a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -59,6 +59,10 @@ unified_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_RRFS_v1beta.xml b/ccpp/suites/suite_FV3_RRFS_v1beta.xml index 01589e271..a61ebfafa 100644 --- a/ccpp/suites/suite_FV3_RRFS_v1beta.xml +++ b/ccpp/suites/suite_FV3_RRFS_v1beta.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,6 +60,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml index 107254b18..34d8721d7 100644 --- a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml +++ b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,6 +60,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_MP_generic_pre diff --git a/ccpp/suites/suite_FV3_WoFS_v0.xml b/ccpp/suites/suite_FV3_WoFS_v0.xml index 6e68a9773..433826903 100644 --- a/ccpp/suites/suite_FV3_WoFS_v0.xml +++ b/ccpp/suites/suite_FV3_WoFS_v0.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,6 +60,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_MP_generic_pre diff --git a/ccpp/suites/suite_FV3_global_nest_v1.xml b/ccpp/suites/suite_FV3_global_nest_v1.xml index 79ef5545f..788110d97 100644 --- a/ccpp/suites/suite_FV3_global_nest_v1.xml +++ b/ccpp/suites/suite_FV3_global_nest_v1.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,6 +60,10 @@ ugwpv1_gsldrag_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_RRFS_sas.xml b/ccpp/suites/suite_RRFS_sas.xml index 6ca272c54..673e4c930 100644 --- a/ccpp/suites/suite_RRFS_sas.xml +++ b/ccpp/suites/suite_RRFS_sas.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,6 +58,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_RRFS_sas_nogwd.xml b/ccpp/suites/suite_RRFS_sas_nogwd.xml index a68c1de3e..8fdce7da0 100644 --- a/ccpp/suites/suite_RRFS_sas_nogwd.xml +++ b/ccpp/suites/suite_RRFS_sas_nogwd.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -55,6 +55,10 @@ mynnedmf_wrapper rrfs_smoke_postpbl GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_RRFSens_phy1.xml b/ccpp/suites/suite_RRFSens_phy1.xml index e5c6f7a91..cb203610d 100644 --- a/ccpp/suites/suite_RRFSens_phy1.xml +++ b/ccpp/suites/suite_RRFSens_phy1.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -59,6 +59,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_RRFSens_phy2.xml b/ccpp/suites/suite_RRFSens_phy2.xml index e2f730833..3cccb62fc 100644 --- a/ccpp/suites/suite_RRFSens_phy2.xml +++ b/ccpp/suites/suite_RRFSens_phy2.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -56,6 +56,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_RRFSens_phy3.xml b/ccpp/suites/suite_RRFSens_phy3.xml index 470f5d15d..8e6322d90 100644 --- a/ccpp/suites/suite_RRFSens_phy3.xml +++ b/ccpp/suites/suite_RRFSens_phy3.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -56,6 +56,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_RRFSens_phy4.xml b/ccpp/suites/suite_RRFSens_phy4.xml index 5813576c8..442288d94 100644 --- a/ccpp/suites/suite_RRFSens_phy4.xml +++ b/ccpp/suites/suite_RRFSens_phy4.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -59,6 +59,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/ccpp/suites/suite_RRFSens_phy5.xml b/ccpp/suites/suite_RRFSens_phy5.xml index c06338056..584965e19 100644 --- a/ccpp/suites/suite_RRFSens_phy5.xml +++ b/ccpp/suites/suite_RRFSens_phy5.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -56,6 +56,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 From 2533e93e4d09650f1b3eee7e8d5f3e9e599b89ad Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 13 Mar 2025 21:30:19 +0000 Subject: [PATCH 2/7] Bug fix in ccpp/driver/CCPP_driver.F90 --- ccpp/driver/CCPP_driver.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90 index 2c8b14aee..f02ab1fa2 100644 --- a/ccpp/driver/CCPP_driver.F90 +++ b/ccpp/driver/CCPP_driver.F90 @@ -204,17 +204,17 @@ subroutine CCPP_step (step, nblks, ierr) !--- Call CCPP radiation/physics/stochastics group if (trim(step)=="physics") then ! Process-split physics - call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="physics_process_split"), ierr=ierr2) + call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="physics_process_split", ierr=ierr2) if (ierr2/=0) then - write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "physics_process_split"), & + write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "physics_process_split", & ", block/chunk ", nb, " and thread ", nt, " (ntX=", ntX, "):" write(0,'(a)') trim(cdata_block(nb,ntX)%errmsg) ierr = ierr + ierr2 endif ! Time-split physics - call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="physics_time_split"), ierr=ierr2) + call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="physics_time_split", ierr=ierr2) if (ierr2/=0) then - write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "physics_time_split"), & + write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "physics_time_split", & ", block/chunk ", nb, " and thread ", nt, " (ntX=", ntX, "):" write(0,'(a)') trim(cdata_block(nb,ntX)%errmsg) ierr = ierr + ierr2 From 9e02979fbdeab448628f4f3eb4fe0aaf92ff41e2 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 13 Mar 2025 19:31:47 -0600 Subject: [PATCH 3/7] Shorten physics_process_split as phys-ps, physics_time_split as phys-ts --- ccpp/driver/CCPP_driver.F90 | 32 +++++++++---------- ...suite_FV3_GFS_v15_thompson_mynn_lam3km.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v15p2.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v16.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v16_csawmg.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v16_flake.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v16_ras.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml | 4 +-- .../suite_FV3_GFS_v17_coupled_p8_c3.xml | 4 +-- .../suite_FV3_GFS_v17_coupled_p8_sfcocn.xml | 4 +-- .../suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_p8.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml | 4 +-- .../suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml | 4 +-- .../suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml | 4 +-- ccpp/suites/suite_FV3_HAFS_v1_thompson.xml | 4 +-- .../suite_FV3_HAFS_v1_thompson_nonsst.xml | 4 +-- ...uite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml | 4 +-- ccpp/suites/suite_FV3_HRRR.xml | 4 +-- ccpp/suites/suite_FV3_HRRR_c3.xml | 4 +-- ccpp/suites/suite_FV3_HRRR_gf.xml | 4 +-- ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml | 4 +-- ccpp/suites/suite_FV3_RAP.xml | 4 +-- ccpp/suites/suite_FV3_RAP_cires_ugwp.xml | 4 +-- ccpp/suites/suite_FV3_RAP_clm_lake.xml | 4 +-- ccpp/suites/suite_FV3_RAP_flake.xml | 4 +-- ccpp/suites/suite_FV3_RAP_noah.xml | 4 +-- .../suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml | 4 +-- ccpp/suites/suite_FV3_RAP_sfcdiff.xml | 4 +-- ccpp/suites/suite_FV3_RAP_unified_ugwp.xml | 4 +-- ccpp/suites/suite_FV3_RRFS_v1beta.xml | 4 +-- ccpp/suites/suite_FV3_RRFS_v1nssl.xml | 4 +-- ccpp/suites/suite_FV3_WoFS_v0.xml | 4 +-- ccpp/suites/suite_FV3_global_nest_v1.xml | 4 +-- ccpp/suites/suite_RRFS_sas.xml | 4 +-- ccpp/suites/suite_RRFS_sas_nogwd.xml | 4 +-- ccpp/suites/suite_RRFSens_phy1.xml | 4 +-- ccpp/suites/suite_RRFSens_phy2.xml | 4 +-- ccpp/suites/suite_RRFSens_phy3.xml | 4 +-- ccpp/suites/suite_RRFSens_phy4.xml | 4 +-- ccpp/suites/suite_RRFSens_phy5.xml | 4 +-- 45 files changed, 104 insertions(+), 104 deletions(-) diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90 index f02ab1fa2..4ac80852c 100644 --- a/ccpp/driver/CCPP_driver.F90 +++ b/ccpp/driver/CCPP_driver.F90 @@ -132,18 +132,18 @@ subroutine CCPP_step (step, nblks, ierr) return end if - ! call timestep_init for "physics_process_split"---required for Land IAU - call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="physics_process_split", ierr=ierr) + ! call timestep_init for "phys-ps"---required for Land IAU + call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="phys-ps", ierr=ierr) if (ierr/=0) then - write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group physics_process_split" + write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group phys-ps" write(0,'(a)') trim(cdata_domain%errmsg) return end if - ! call timestep_init for "physics_time_split"---required for Land IAU - call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="physics_time_split", ierr=ierr) + ! call timestep_init for "phys-ts"---required for Land IAU + call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="phys-ts", ierr=ierr) if (ierr/=0) then - write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group physics_time_split" + write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group phys-ts" write(0,'(a)') trim(cdata_domain%errmsg) return end if @@ -204,17 +204,17 @@ subroutine CCPP_step (step, nblks, ierr) !--- Call CCPP radiation/physics/stochastics group if (trim(step)=="physics") then ! Process-split physics - call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="physics_process_split", ierr=ierr2) + call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="phys-ps", ierr=ierr2) if (ierr2/=0) then - write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "physics_process_split", & + write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "phys-ps", & ", block/chunk ", nb, " and thread ", nt, " (ntX=", ntX, "):" write(0,'(a)') trim(cdata_block(nb,ntX)%errmsg) ierr = ierr + ierr2 endif ! Time-split physics - call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="physics_time_split", ierr=ierr2) + call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="phys-ts", ierr=ierr2) if (ierr2/=0) then - write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "physics_time_split", & + write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "phys-ts", & ", block/chunk ", nb, " and thread ", nt, " (ntX=", ntX, "):" write(0,'(a)') trim(cdata_block(nb,ntX)%errmsg) ierr = ierr + ierr2 @@ -249,18 +249,18 @@ subroutine CCPP_step (step, nblks, ierr) return end if - ! call timestep_finalize for "physics_process_split"---required for Land IAU - call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="physics_process_split", ierr=ierr) + ! call timestep_finalize for "phys-ps"---required for Land IAU + call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="phys-ps", ierr=ierr) if (ierr/=0) then - write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group physics_process_split" + write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group phys-ps" write(0,'(a)') trim(cdata_domain%errmsg) return end if - ! call timestep_finalize for "physics_time_split"---required for Land IAU - call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="physics_time_split", ierr=ierr) + ! call timestep_finalize for "phys-ts"---required for Land IAU + call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="phys-ts", ierr=ierr) if (ierr/=0) then - write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group physics_time_split" + write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group phys-ts" write(0,'(a)') trim(cdata_domain%errmsg) return end if diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml index 2921d3ed2..0c821baad 100644 --- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v15p2.xml b/ccpp/suites/suite_FV3_GFS_v15p2.xml index 182515584..ce479b0b4 100644 --- a/ccpp/suites/suite_FV3_GFS_v15p2.xml +++ b/ccpp/suites/suite_FV3_GFS_v15p2.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -67,7 +67,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v16.xml b/ccpp/suites/suite_FV3_GFS_v16.xml index 3d07a56a9..18c7cb925 100644 --- a/ccpp/suites/suite_FV3_GFS_v16.xml +++ b/ccpp/suites/suite_FV3_GFS_v16.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -67,7 +67,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml b/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml index 14c10d8f1..4d2548077 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_flake.xml b/ccpp/suites/suite_FV3_GFS_v16_flake.xml index 54b04bf0f..a3b28e6a7 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_flake.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_flake.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -68,7 +68,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml b/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml index 558140fbf..178d4ab47 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_ras.xml b/ccpp/suites/suite_FV3_GFS_v16_ras.xml index 14359e0d3..6f03f6de8 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_ras.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_ras.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -67,7 +67,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml index 6124eff22..e0a0d513b 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -64,7 +64,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml index 0cae1a8d5..59a1e4ed7 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -63,7 +63,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml index 8f425e2a1..34d228cf3 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml index 49c7adce6..c22cd281e 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -64,7 +64,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8.xml b/ccpp/suites/suite_FV3_GFS_v17_p8.xml index 137713934..4aeb49391 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -63,7 +63,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml index 466be2f73..55c0a3068 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -64,7 +64,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml index 63bb2b2b6..95996ea09 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -65,7 +65,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml index 7695b6440..f1eae7745 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml @@ -24,7 +24,7 @@ GFS_rrtmgp_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -63,7 +63,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml index ac2e9af85..7af93830d 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -63,7 +63,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml index 26a43113e..4a248859e 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -67,7 +67,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml index b295c4060..7e77d669d 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -65,7 +65,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml index 56c070dcf..b251851fd 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml index f0fc23557..9fd20ca9d 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml index eaf4de4df..fd134db11 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HRRR.xml b/ccpp/suites/suite_FV3_HRRR.xml index bcbae2812..448f41ef7 100644 --- a/ccpp/suites/suite_FV3_HRRR.xml +++ b/ccpp/suites/suite_FV3_HRRR.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HRRR_c3.xml b/ccpp/suites/suite_FV3_HRRR_c3.xml index 285d7533e..1aae7e538 100644 --- a/ccpp/suites/suite_FV3_HRRR_c3.xml +++ b/ccpp/suites/suite_FV3_HRRR_c3.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HRRR_gf.xml b/ccpp/suites/suite_FV3_HRRR_gf.xml index aaa57f0a6..2d65dbae6 100644 --- a/ccpp/suites/suite_FV3_HRRR_gf.xml +++ b/ccpp/suites/suite_FV3_HRRR_gf.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml index 41b95d562..0cd5bbe2b 100644 --- a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml +++ b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -57,7 +57,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP.xml b/ccpp/suites/suite_FV3_RAP.xml index 81c43f661..98acc0d70 100644 --- a/ccpp/suites/suite_FV3_RAP.xml +++ b/ccpp/suites/suite_FV3_RAP.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml index 0d696c402..71d7d3ba4 100644 --- a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_clm_lake.xml b/ccpp/suites/suite_FV3_RAP_clm_lake.xml index 0b34664a1..573f27b2b 100644 --- a/ccpp/suites/suite_FV3_RAP_clm_lake.xml +++ b/ccpp/suites/suite_FV3_RAP_clm_lake.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_flake.xml b/ccpp/suites/suite_FV3_RAP_flake.xml index 767f99765..33f0a7242 100644 --- a/ccpp/suites/suite_FV3_RAP_flake.xml +++ b/ccpp/suites/suite_FV3_RAP_flake.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_noah.xml b/ccpp/suites/suite_FV3_RAP_noah.xml index 3ca2074dd..8befdd047 100644 --- a/ccpp/suites/suite_FV3_RAP_noah.xml +++ b/ccpp/suites/suite_FV3_RAP_noah.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml index 6a49729ce..c3a96fbe2 100644 --- a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml index 04d6e47cc..975ef0286 100644 --- a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml +++ b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml index 1ba45be0d..edc586f4b 100644 --- a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RRFS_v1beta.xml b/ccpp/suites/suite_FV3_RRFS_v1beta.xml index a61ebfafa..c43f1e521 100644 --- a/ccpp/suites/suite_FV3_RRFS_v1beta.xml +++ b/ccpp/suites/suite_FV3_RRFS_v1beta.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml index 34d8721d7..d3d4a392b 100644 --- a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml +++ b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_WoFS_v0.xml b/ccpp/suites/suite_FV3_WoFS_v0.xml index 433826903..2486d01ad 100644 --- a/ccpp/suites/suite_FV3_WoFS_v0.xml +++ b/ccpp/suites/suite_FV3_WoFS_v0.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_global_nest_v1.xml b/ccpp/suites/suite_FV3_global_nest_v1.xml index 788110d97..3d879d408 100644 --- a/ccpp/suites/suite_FV3_global_nest_v1.xml +++ b/ccpp/suites/suite_FV3_global_nest_v1.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFS_sas.xml b/ccpp/suites/suite_RRFS_sas.xml index 673e4c930..7b47d4fd4 100644 --- a/ccpp/suites/suite_RRFS_sas.xml +++ b/ccpp/suites/suite_RRFS_sas.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFS_sas_nogwd.xml b/ccpp/suites/suite_RRFS_sas_nogwd.xml index 8fdce7da0..578e1da68 100644 --- a/ccpp/suites/suite_RRFS_sas_nogwd.xml +++ b/ccpp/suites/suite_RRFS_sas_nogwd.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -57,7 +57,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFSens_phy1.xml b/ccpp/suites/suite_RRFSens_phy1.xml index cb203610d..3149167fe 100644 --- a/ccpp/suites/suite_RRFSens_phy1.xml +++ b/ccpp/suites/suite_RRFSens_phy1.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFSens_phy2.xml b/ccpp/suites/suite_RRFSens_phy2.xml index 3cccb62fc..5eeb05f7e 100644 --- a/ccpp/suites/suite_RRFSens_phy2.xml +++ b/ccpp/suites/suite_RRFSens_phy2.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,7 +58,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFSens_phy3.xml b/ccpp/suites/suite_RRFSens_phy3.xml index 8e6322d90..f774bb4d7 100644 --- a/ccpp/suites/suite_RRFSens_phy3.xml +++ b/ccpp/suites/suite_RRFSens_phy3.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,7 +58,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFSens_phy4.xml b/ccpp/suites/suite_RRFSens_phy4.xml index 442288d94..b23e436a4 100644 --- a/ccpp/suites/suite_RRFSens_phy4.xml +++ b/ccpp/suites/suite_RRFSens_phy4.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFSens_phy5.xml b/ccpp/suites/suite_RRFSens_phy5.xml index 584965e19..2ac234037 100644 --- a/ccpp/suites/suite_RRFSens_phy5.xml +++ b/ccpp/suites/suite_RRFSens_phy5.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,7 +58,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 From 13d12e0e2dc356362f48bbd5310ddb5e3cea8c92 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 14 Mar 2025 05:36:57 -0600 Subject: [PATCH 4/7] Bug fix: phys-{ts,ps} --> phys_{ts,ps} --- ccpp/driver/CCPP_driver.F90 | 32 +++++++++---------- ...suite_FV3_GFS_v15_thompson_mynn_lam3km.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v15p2.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v16.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v16_csawmg.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v16_flake.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v16_ras.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml | 4 +-- .../suite_FV3_GFS_v17_coupled_p8_c3.xml | 4 +-- .../suite_FV3_GFS_v17_coupled_p8_sfcocn.xml | 4 +-- .../suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_p8.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml | 4 +-- ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml | 4 +-- .../suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml | 4 +-- .../suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml | 4 +-- ccpp/suites/suite_FV3_HAFS_v1_thompson.xml | 4 +-- .../suite_FV3_HAFS_v1_thompson_nonsst.xml | 4 +-- ...uite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml | 4 +-- ccpp/suites/suite_FV3_HRRR.xml | 4 +-- ccpp/suites/suite_FV3_HRRR_c3.xml | 4 +-- ccpp/suites/suite_FV3_HRRR_gf.xml | 4 +-- ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml | 4 +-- ccpp/suites/suite_FV3_RAP.xml | 4 +-- ccpp/suites/suite_FV3_RAP_cires_ugwp.xml | 4 +-- ccpp/suites/suite_FV3_RAP_clm_lake.xml | 4 +-- ccpp/suites/suite_FV3_RAP_flake.xml | 4 +-- ccpp/suites/suite_FV3_RAP_noah.xml | 4 +-- .../suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml | 4 +-- ccpp/suites/suite_FV3_RAP_sfcdiff.xml | 4 +-- ccpp/suites/suite_FV3_RAP_unified_ugwp.xml | 4 +-- ccpp/suites/suite_FV3_RRFS_v1beta.xml | 4 +-- ccpp/suites/suite_FV3_RRFS_v1nssl.xml | 4 +-- ccpp/suites/suite_FV3_WoFS_v0.xml | 4 +-- ccpp/suites/suite_FV3_global_nest_v1.xml | 4 +-- ccpp/suites/suite_RRFS_sas.xml | 4 +-- ccpp/suites/suite_RRFS_sas_nogwd.xml | 4 +-- ccpp/suites/suite_RRFSens_phy1.xml | 4 +-- ccpp/suites/suite_RRFSens_phy2.xml | 4 +-- ccpp/suites/suite_RRFSens_phy3.xml | 4 +-- ccpp/suites/suite_RRFSens_phy4.xml | 4 +-- ccpp/suites/suite_RRFSens_phy5.xml | 4 +-- 45 files changed, 104 insertions(+), 104 deletions(-) diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90 index 4ac80852c..57786a79b 100644 --- a/ccpp/driver/CCPP_driver.F90 +++ b/ccpp/driver/CCPP_driver.F90 @@ -132,18 +132,18 @@ subroutine CCPP_step (step, nblks, ierr) return end if - ! call timestep_init for "phys-ps"---required for Land IAU - call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="phys-ps", ierr=ierr) + ! call timestep_init for "phys_ps"---required for Land IAU + call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="phys_ps", ierr=ierr) if (ierr/=0) then - write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group phys-ps" + write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group phys_ps" write(0,'(a)') trim(cdata_domain%errmsg) return end if - ! call timestep_init for "phys-ts"---required for Land IAU - call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="phys-ts", ierr=ierr) + ! call timestep_init for "phys_ts"---required for Land IAU + call ccpp_physics_timestep_init(cdata_domain, suite_name=trim(ccpp_suite),group_name="phys_ts", ierr=ierr) if (ierr/=0) then - write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group phys-ts" + write(0,'(a)') "An error occurred in ccpp_physics_timestep_init for group phys_ts" write(0,'(a)') trim(cdata_domain%errmsg) return end if @@ -204,17 +204,17 @@ subroutine CCPP_step (step, nblks, ierr) !--- Call CCPP radiation/physics/stochastics group if (trim(step)=="physics") then ! Process-split physics - call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="phys-ps", ierr=ierr2) + call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="phys_ps", ierr=ierr2) if (ierr2/=0) then - write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "phys-ps", & + write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "phys_ps", & ", block/chunk ", nb, " and thread ", nt, " (ntX=", ntX, "):" write(0,'(a)') trim(cdata_block(nb,ntX)%errmsg) ierr = ierr + ierr2 endif ! Time-split physics - call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="phys-ts", ierr=ierr2) + call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="phys_ts", ierr=ierr2) if (ierr2/=0) then - write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "phys-ts", & + write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", "phys_ts", & ", block/chunk ", nb, " and thread ", nt, " (ntX=", ntX, "):" write(0,'(a)') trim(cdata_block(nb,ntX)%errmsg) ierr = ierr + ierr2 @@ -249,18 +249,18 @@ subroutine CCPP_step (step, nblks, ierr) return end if - ! call timestep_finalize for "phys-ps"---required for Land IAU - call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="phys-ps", ierr=ierr) + ! call timestep_finalize for "phys_ps"---required for Land IAU + call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="phys_ps", ierr=ierr) if (ierr/=0) then - write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group phys-ps" + write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group phys_ps" write(0,'(a)') trim(cdata_domain%errmsg) return end if - ! call timestep_finalize for "phys-ts"---required for Land IAU - call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="phys-ts", ierr=ierr) + ! call timestep_finalize for "phys_ts"---required for Land IAU + call ccpp_physics_timestep_finalize(cdata_domain, suite_name=trim(ccpp_suite), group_name="phys_ts", ierr=ierr) if (ierr/=0) then - write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group phys-ts" + write(0,'(a)') "An error occurred in ccpp_physics_timestep_finalize for group phys_ts" write(0,'(a)') trim(cdata_domain%errmsg) return end if diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml index 0c821baad..e676b8ce9 100644 --- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v15p2.xml b/ccpp/suites/suite_FV3_GFS_v15p2.xml index ce479b0b4..f3816fcca 100644 --- a/ccpp/suites/suite_FV3_GFS_v15p2.xml +++ b/ccpp/suites/suite_FV3_GFS_v15p2.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -67,7 +67,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v16.xml b/ccpp/suites/suite_FV3_GFS_v16.xml index 18c7cb925..c5c17ab9d 100644 --- a/ccpp/suites/suite_FV3_GFS_v16.xml +++ b/ccpp/suites/suite_FV3_GFS_v16.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -67,7 +67,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml b/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml index 4d2548077..291c3325d 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_flake.xml b/ccpp/suites/suite_FV3_GFS_v16_flake.xml index a3b28e6a7..ff283df0b 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_flake.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_flake.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -68,7 +68,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml b/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml index 178d4ab47..ad657777b 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v16_ras.xml b/ccpp/suites/suite_FV3_GFS_v16_ras.xml index 6f03f6de8..bc21c5662 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_ras.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_ras.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -67,7 +67,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml index e0a0d513b..5b70efbda 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -64,7 +64,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml index 59a1e4ed7..c923b2222 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -63,7 +63,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml index 34d228cf3..c015af2dc 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml index c22cd281e..d673396d9 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -64,7 +64,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8.xml b/ccpp/suites/suite_FV3_GFS_v17_p8.xml index 4aeb49391..0e01dd2bd 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -63,7 +63,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml index 55c0a3068..92b419f90 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -64,7 +64,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml index 95996ea09..8b4e2c741 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -65,7 +65,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml index f1eae7745..e7a2fa576 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml @@ -24,7 +24,7 @@ GFS_rrtmgp_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -63,7 +63,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml index 7af93830d..fe9648709 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -63,7 +63,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml index 4a248859e..8b4ed002a 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -67,7 +67,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml index 7e77d669d..9c429b58e 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml @@ -28,7 +28,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -65,7 +65,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml index b251851fd..e720e398d 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml index 9fd20ca9d..461d0e72e 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml index fd134db11..a24ecdd38 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml @@ -23,7 +23,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HRRR.xml b/ccpp/suites/suite_FV3_HRRR.xml index 448f41ef7..acb0eb749 100644 --- a/ccpp/suites/suite_FV3_HRRR.xml +++ b/ccpp/suites/suite_FV3_HRRR.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HRRR_c3.xml b/ccpp/suites/suite_FV3_HRRR_c3.xml index 1aae7e538..9337625ba 100644 --- a/ccpp/suites/suite_FV3_HRRR_c3.xml +++ b/ccpp/suites/suite_FV3_HRRR_c3.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HRRR_gf.xml b/ccpp/suites/suite_FV3_HRRR_gf.xml index 2d65dbae6..36a28d2d7 100644 --- a/ccpp/suites/suite_FV3_HRRR_gf.xml +++ b/ccpp/suites/suite_FV3_HRRR_gf.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml index 0cd5bbe2b..72275efe9 100644 --- a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml +++ b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -57,7 +57,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP.xml b/ccpp/suites/suite_FV3_RAP.xml index 98acc0d70..d592db31d 100644 --- a/ccpp/suites/suite_FV3_RAP.xml +++ b/ccpp/suites/suite_FV3_RAP.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml index 71d7d3ba4..5d5fe6e8a 100644 --- a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_clm_lake.xml b/ccpp/suites/suite_FV3_RAP_clm_lake.xml index 573f27b2b..87f745829 100644 --- a/ccpp/suites/suite_FV3_RAP_clm_lake.xml +++ b/ccpp/suites/suite_FV3_RAP_clm_lake.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_flake.xml b/ccpp/suites/suite_FV3_RAP_flake.xml index 33f0a7242..c07cb0542 100644 --- a/ccpp/suites/suite_FV3_RAP_flake.xml +++ b/ccpp/suites/suite_FV3_RAP_flake.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_noah.xml b/ccpp/suites/suite_FV3_RAP_noah.xml index 8befdd047..ef5bd09be 100644 --- a/ccpp/suites/suite_FV3_RAP_noah.xml +++ b/ccpp/suites/suite_FV3_RAP_noah.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml index c3a96fbe2..083abb121 100644 --- a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml index 975ef0286..4bf5a5d21 100644 --- a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml +++ b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml index edc586f4b..76242f592 100644 --- a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RRFS_v1beta.xml b/ccpp/suites/suite_FV3_RRFS_v1beta.xml index c43f1e521..fe11fea84 100644 --- a/ccpp/suites/suite_FV3_RRFS_v1beta.xml +++ b/ccpp/suites/suite_FV3_RRFS_v1beta.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml index d3d4a392b..e791395a6 100644 --- a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml +++ b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_WoFS_v0.xml b/ccpp/suites/suite_FV3_WoFS_v0.xml index 2486d01ad..c2a56e26a 100644 --- a/ccpp/suites/suite_FV3_WoFS_v0.xml +++ b/ccpp/suites/suite_FV3_WoFS_v0.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_FV3_global_nest_v1.xml b/ccpp/suites/suite_FV3_global_nest_v1.xml index 3d879d408..fcd77c031 100644 --- a/ccpp/suites/suite_FV3_global_nest_v1.xml +++ b/ccpp/suites/suite_FV3_global_nest_v1.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -62,7 +62,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFS_sas.xml b/ccpp/suites/suite_RRFS_sas.xml index 7b47d4fd4..c2d249205 100644 --- a/ccpp/suites/suite_RRFS_sas.xml +++ b/ccpp/suites/suite_RRFS_sas.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -60,7 +60,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFS_sas_nogwd.xml b/ccpp/suites/suite_RRFS_sas_nogwd.xml index 578e1da68..f0b09295c 100644 --- a/ccpp/suites/suite_RRFS_sas_nogwd.xml +++ b/ccpp/suites/suite_RRFS_sas_nogwd.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -57,7 +57,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFSens_phy1.xml b/ccpp/suites/suite_RRFSens_phy1.xml index 3149167fe..f14409b30 100644 --- a/ccpp/suites/suite_RRFSens_phy1.xml +++ b/ccpp/suites/suite_RRFSens_phy1.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFSens_phy2.xml b/ccpp/suites/suite_RRFSens_phy2.xml index 5eeb05f7e..57937bac3 100644 --- a/ccpp/suites/suite_RRFSens_phy2.xml +++ b/ccpp/suites/suite_RRFSens_phy2.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,7 +58,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFSens_phy3.xml b/ccpp/suites/suite_RRFSens_phy3.xml index f774bb4d7..7114818a2 100644 --- a/ccpp/suites/suite_RRFSens_phy3.xml +++ b/ccpp/suites/suite_RRFSens_phy3.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,7 +58,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFSens_phy4.xml b/ccpp/suites/suite_RRFSens_phy4.xml index b23e436a4..93ec62fd5 100644 --- a/ccpp/suites/suite_RRFSens_phy4.xml +++ b/ccpp/suites/suite_RRFSens_phy4.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -61,7 +61,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 diff --git a/ccpp/suites/suite_RRFSens_phy5.xml b/ccpp/suites/suite_RRFSens_phy5.xml index 2ac234037..e9826856c 100644 --- a/ccpp/suites/suite_RRFSens_phy5.xml +++ b/ccpp/suites/suite_RRFSens_phy5.xml @@ -25,7 +25,7 @@ GFS_rrtmg_post - + GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset @@ -58,7 +58,7 @@ GFS_suite_stateout_update - + GFS_photochemistry get_phi_fv3 From cf29d059120767b153a0b2fb6514dc778e8042cc Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 14 Mar 2025 09:49:50 -0600 Subject: [PATCH 5/7] Remove GFS_suite_interstial_{phys,rad}_reset schemes from all suites --- .gitmodules | 6 ++++-- ccpp/driver/CCPP_driver.F90 | 15 ++++++++++++--- ccpp/physics | 2 +- .../suite_FV3_GFS_v15_thompson_mynn_lam3km.xml | 2 -- ccpp/suites/suite_FV3_GFS_v15p2.xml | 2 -- ccpp/suites/suite_FV3_GFS_v16.xml | 2 -- ccpp/suites/suite_FV3_GFS_v16_csawmg.xml | 2 -- ccpp/suites/suite_FV3_GFS_v16_flake.xml | 2 -- ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml | 2 -- ccpp/suites/suite_FV3_GFS_v16_ras.xml | 2 -- ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml | 2 -- ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml | 2 -- .../suite_FV3_GFS_v17_coupled_p8_sfcocn.xml | 2 -- .../suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml | 2 -- ccpp/suites/suite_FV3_GFS_v17_p8.xml | 2 -- ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml | 2 -- ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml | 2 -- ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml | 2 -- ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml | 2 -- ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml | 2 -- .../suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml | 2 -- ccpp/suites/suite_FV3_HAFS_v1_thompson.xml | 2 -- ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml | 2 -- .../suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml | 2 -- ccpp/suites/suite_FV3_HRRR.xml | 2 -- ccpp/suites/suite_FV3_HRRR_c3.xml | 2 -- ccpp/suites/suite_FV3_HRRR_gf.xml | 2 -- ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml | 2 -- ccpp/suites/suite_FV3_RAP.xml | 2 -- ccpp/suites/suite_FV3_RAP_cires_ugwp.xml | 2 -- ccpp/suites/suite_FV3_RAP_clm_lake.xml | 2 -- ccpp/suites/suite_FV3_RAP_flake.xml | 2 -- ccpp/suites/suite_FV3_RAP_noah.xml | 2 -- .../suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml | 2 -- ccpp/suites/suite_FV3_RAP_sfcdiff.xml | 2 -- ccpp/suites/suite_FV3_RAP_unified_ugwp.xml | 2 -- ccpp/suites/suite_FV3_RRFS_v1beta.xml | 2 -- ccpp/suites/suite_FV3_RRFS_v1nssl.xml | 2 -- ccpp/suites/suite_FV3_WoFS_v0.xml | 2 -- ccpp/suites/suite_FV3_global_nest_v1.xml | 2 -- ccpp/suites/suite_RRFS_sas.xml | 2 -- ccpp/suites/suite_RRFS_sas_nogwd.xml | 2 -- ccpp/suites/suite_RRFSens_phy1.xml | 2 -- ccpp/suites/suite_RRFSens_phy2.xml | 2 -- ccpp/suites/suite_RRFSens_phy3.xml | 2 -- ccpp/suites/suite_RRFSens_phy4.xml | 2 -- ccpp/suites/suite_RRFSens_phy5.xml | 2 -- 47 files changed, 17 insertions(+), 94 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..0840ab23a 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/climbfuji/ccpp-physics + branch = feature/remove_gfs_int_radphys_reset [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90 index 57786a79b..1ea235891 100644 --- a/ccpp/driver/CCPP_driver.F90 +++ b/ccpp/driver/CCPP_driver.F90 @@ -13,7 +13,8 @@ module CCPP_driver cdata_block, & ccpp_suite, & GFS_control, & - GFS_Intdiag + GFS_Intdiag, & + GFS_Interstitial implicit none @@ -184,8 +185,9 @@ subroutine CCPP_step (step, nblks, ierr) !$OMP parallel num_threads (nthrds) & !$OMP default (none) & !$OMP shared (nblks, nthrdsX, non_uniform_blocks, & -!$OMP cdata_block,ccpp_suite, step) & -!$OMP private (nb,nt,ntX,ierr2) & +!$OMP cdata_block, ccpp_suite, step, & +!$OMP GFS_Interstitial) & +!$OMP private (nb, nt, ntX, ierr2) & !$OMP reduction (+:ierr) #ifdef _OPENMP nt = omp_get_thread_num()+1 @@ -203,6 +205,8 @@ subroutine CCPP_step (step, nblks, ierr) end if !--- Call CCPP radiation/physics/stochastics group if (trim(step)=="physics") then + ! Reset GFS_Interstitial DDT physics fields for this thread + call GFS_Interstitial(ntX)%phys_reset(GFS_control) ! Process-split physics call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name="phys_ps", ierr=ierr2) if (ierr2/=0) then @@ -220,6 +224,11 @@ subroutine CCPP_step (step, nblks, ierr) ierr = ierr + ierr2 endif else + if (trim(step)=="radiation") then + ! Reset GFS_Interstitial DDT radiation fields for this thread + call GFS_Interstitial(ntX)%rad_reset(GFS_control) + end if + ! Radiation call ccpp_physics_run(cdata_block(nb,ntX), suite_name=trim(ccpp_suite), group_name=trim(step), ierr=ierr2) if (ierr2/=0) then write(0,'(2a,3(a,i4),a)') "An error occurred in ccpp_physics_run for group ", trim(step), & diff --git a/ccpp/physics b/ccpp/physics index 38268cff0..3045a9f34 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 38268cff07b100998757a10b76f533d83e7c33ee +Subproject commit 3045a9f34e4c42ce29a99db5fa842d0da3579382 diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml index e676b8ce9..8028ea7a1 100644 --- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v15p2.xml b/ccpp/suites/suite_FV3_GFS_v15p2.xml index f3816fcca..f9db755e9 100644 --- a/ccpp/suites/suite_FV3_GFS_v15p2.xml +++ b/ccpp/suites/suite_FV3_GFS_v15p2.xml @@ -17,7 +17,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -30,7 +29,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v16.xml b/ccpp/suites/suite_FV3_GFS_v16.xml index c5c17ab9d..ce5736e5c 100644 --- a/ccpp/suites/suite_FV3_GFS_v16.xml +++ b/ccpp/suites/suite_FV3_GFS_v16.xml @@ -17,7 +17,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -30,7 +29,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml b/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml index 291c3325d..f70d9174d 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -25,7 +24,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v16_flake.xml b/ccpp/suites/suite_FV3_GFS_v16_flake.xml index ff283df0b..15b547ffb 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_flake.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_flake.xml @@ -17,7 +17,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -30,7 +29,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml b/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml index ad657777b..04191ca7e 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -25,7 +24,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v16_ras.xml b/ccpp/suites/suite_FV3_GFS_v16_ras.xml index bc21c5662..506964317 100644 --- a/ccpp/suites/suite_FV3_GFS_v16_ras.xml +++ b/ccpp/suites/suite_FV3_GFS_v16_ras.xml @@ -17,7 +17,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -30,7 +29,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml index 5b70efbda..3b79d258b 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -25,7 +24,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml index c923b2222..439755717 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -25,7 +24,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml index c015af2dc..28a9085ec 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -25,7 +24,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml index d673396d9..b75921dba 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -25,7 +24,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8.xml b/ccpp/suites/suite_FV3_GFS_v17_p8.xml index 0e01dd2bd..f08119e9a 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -25,7 +24,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml index 92b419f90..d0d15f1b8 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml index 8b4e2c741..36bc3d050 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml index e7a2fa576..0a5b9222e 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmgp_pre GFS_radiation_surface GFS_rrtmgp_cloud_mp @@ -26,7 +25,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml index fe9648709..6d32a42a2 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -25,7 +24,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml index 8b4ed002a..09f6ff89d 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml @@ -17,7 +17,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -30,7 +29,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml index 9c429b58e..15cca099c 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml @@ -17,7 +17,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -30,7 +29,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml index e720e398d..a4b84e5f4 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -25,7 +24,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml index 461d0e72e..2ef7a87cc 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -25,7 +24,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml index a24ecdd38..407af6f03 100644 --- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml +++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -25,7 +24,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_HRRR.xml b/ccpp/suites/suite_FV3_HRRR.xml index acb0eb749..aa4654d7c 100644 --- a/ccpp/suites/suite_FV3_HRRR.xml +++ b/ccpp/suites/suite_FV3_HRRR.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_HRRR_c3.xml b/ccpp/suites/suite_FV3_HRRR_c3.xml index 9337625ba..4eb6410d6 100644 --- a/ccpp/suites/suite_FV3_HRRR_c3.xml +++ b/ccpp/suites/suite_FV3_HRRR_c3.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_HRRR_gf.xml b/ccpp/suites/suite_FV3_HRRR_gf.xml index 36a28d2d7..c3dca9f50 100644 --- a/ccpp/suites/suite_FV3_HRRR_gf.xml +++ b/ccpp/suites/suite_FV3_HRRR_gf.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml index 72275efe9..6d746f1fa 100644 --- a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml +++ b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_RAP.xml b/ccpp/suites/suite_FV3_RAP.xml index d592db31d..1e6db9879 100644 --- a/ccpp/suites/suite_FV3_RAP.xml +++ b/ccpp/suites/suite_FV3_RAP.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml index 5d5fe6e8a..5d06b63e1 100644 --- a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_RAP_clm_lake.xml b/ccpp/suites/suite_FV3_RAP_clm_lake.xml index 87f745829..adc19d8f6 100644 --- a/ccpp/suites/suite_FV3_RAP_clm_lake.xml +++ b/ccpp/suites/suite_FV3_RAP_clm_lake.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_RAP_flake.xml b/ccpp/suites/suite_FV3_RAP_flake.xml index c07cb0542..b4c90d9e6 100644 --- a/ccpp/suites/suite_FV3_RAP_flake.xml +++ b/ccpp/suites/suite_FV3_RAP_flake.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_RAP_noah.xml b/ccpp/suites/suite_FV3_RAP_noah.xml index ef5bd09be..6db03b211 100644 --- a/ccpp/suites/suite_FV3_RAP_noah.xml +++ b/ccpp/suites/suite_FV3_RAP_noah.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml index 083abb121..115c94a21 100644 --- a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml index 4bf5a5d21..0ae504da1 100644 --- a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml +++ b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml index 76242f592..61aa5fc16 100644 --- a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml +++ b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_RRFS_v1beta.xml b/ccpp/suites/suite_FV3_RRFS_v1beta.xml index fe11fea84..234b48b72 100644 --- a/ccpp/suites/suite_FV3_RRFS_v1beta.xml +++ b/ccpp/suites/suite_FV3_RRFS_v1beta.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml index e791395a6..e5c11b97b 100644 --- a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml +++ b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_WoFS_v0.xml b/ccpp/suites/suite_FV3_WoFS_v0.xml index c2a56e26a..c1e1f7ccd 100644 --- a/ccpp/suites/suite_FV3_WoFS_v0.xml +++ b/ccpp/suites/suite_FV3_WoFS_v0.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_FV3_global_nest_v1.xml b/ccpp/suites/suite_FV3_global_nest_v1.xml index fcd77c031..956b26741 100644 --- a/ccpp/suites/suite_FV3_global_nest_v1.xml +++ b/ccpp/suites/suite_FV3_global_nest_v1.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_RRFS_sas.xml b/ccpp/suites/suite_RRFS_sas.xml index c2d249205..7275e151f 100644 --- a/ccpp/suites/suite_RRFS_sas.xml +++ b/ccpp/suites/suite_RRFS_sas.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_RRFS_sas_nogwd.xml b/ccpp/suites/suite_RRFS_sas_nogwd.xml index f0b09295c..d2c1346ec 100644 --- a/ccpp/suites/suite_RRFS_sas_nogwd.xml +++ b/ccpp/suites/suite_RRFS_sas_nogwd.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_RRFSens_phy1.xml b/ccpp/suites/suite_RRFSens_phy1.xml index f14409b30..51366f2f2 100644 --- a/ccpp/suites/suite_RRFSens_phy1.xml +++ b/ccpp/suites/suite_RRFSens_phy1.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_RRFSens_phy2.xml b/ccpp/suites/suite_RRFSens_phy2.xml index 57937bac3..db8c2d28d 100644 --- a/ccpp/suites/suite_RRFSens_phy2.xml +++ b/ccpp/suites/suite_RRFSens_phy2.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_RRFSens_phy3.xml b/ccpp/suites/suite_RRFSens_phy3.xml index 7114818a2..b4767562f 100644 --- a/ccpp/suites/suite_RRFSens_phy3.xml +++ b/ccpp/suites/suite_RRFSens_phy3.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_RRFSens_phy4.xml b/ccpp/suites/suite_RRFSens_phy4.xml index 93ec62fd5..aca458329 100644 --- a/ccpp/suites/suite_RRFSens_phy4.xml +++ b/ccpp/suites/suite_RRFSens_phy4.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 diff --git a/ccpp/suites/suite_RRFSens_phy5.xml b/ccpp/suites/suite_RRFSens_phy5.xml index e9826856c..77c99805a 100644 --- a/ccpp/suites/suite_RRFSens_phy5.xml +++ b/ccpp/suites/suite_RRFSens_phy5.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -27,7 +26,6 @@ - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 From f2e5c2f78bb1e821dcc321d8d8b28356ddfb5d9e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 14 Mar 2025 10:17:15 -0600 Subject: [PATCH 6/7] Remove GFS_suite_interstitial_{phys,rad}_reset.* from ccpp/config/ccpp_prebuild_config.py --- ccpp/config/ccpp_prebuild_config.py | 2 -- ccpp/physics | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py index 5e91f3ef6..55ecf0d5d 100755 --- a/ccpp/config/ccpp_prebuild_config.py +++ b/ccpp/config/ccpp_prebuild_config.py @@ -109,8 +109,6 @@ 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.F90', 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.F90', 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_stochastics.F90', - 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.F90', - 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.F90', 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.F90', 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.F90', 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.F90', diff --git a/ccpp/physics b/ccpp/physics index 3045a9f34..822ad1892 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3045a9f34e4c42ce29a99db5fa842d0da3579382 +Subproject commit 822ad1892e3f09a375c46f7dfd79cc11cacefeeb From 60db3bcdf5a873583552b5cfce5652149b347e2a Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 14 Mar 2025 10:45:54 -0600 Subject: [PATCH 7/7] Add missing OpenMP shared clause for GFS_Control in ccpp/driver/CCPP_driver.F90 --- ccpp/driver/CCPP_driver.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90 index 1ea235891..bcea940c1 100644 --- a/ccpp/driver/CCPP_driver.F90 +++ b/ccpp/driver/CCPP_driver.F90 @@ -186,7 +186,7 @@ subroutine CCPP_step (step, nblks, ierr) !$OMP default (none) & !$OMP shared (nblks, nthrdsX, non_uniform_blocks, & !$OMP cdata_block, ccpp_suite, step, & -!$OMP GFS_Interstitial) & +!$OMP GFS_Control, GFS_Interstitial) & !$OMP private (nb, nt, ntX, ierr2) & !$OMP reduction (+:ierr) #ifdef _OPENMP