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/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/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90 index 065e97ef9..bcea940c1 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 @@ -132,14 +133,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 "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" + 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 - + 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) + if (ierr/=0) then + 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 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! DH* 20210104 - this block of code will be removed once the CCPP framework ! ! fully supports handling diagnostics through its metadata, work in progress ! @@ -176,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_Control, GFS_Interstitial) & +!$OMP private (nb, nt, ntX, ierr2) & !$OMP reduction (+:ierr) #ifdef _OPENMP nt = omp_get_thread_num()+1 @@ -194,12 +204,38 @@ 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 + ! 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 + 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) + if (ierr2/=0) then + 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 + 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), & + ", 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 +258,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 "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" + 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 + 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) + if (ierr/=0) then + 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 ! Physics finalize else if (trim(step)=="physics_finalize") then diff --git a/ccpp/physics b/ccpp/physics index 38268cff0..822ad1892 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 38268cff07b100998757a10b76f533d83e7c33ee +Subproject commit 822ad1892e3f09a375c46f7dfd79cc11cacefeeb 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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -59,6 +57,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..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 @@ -28,9 +27,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -65,6 +63,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..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 @@ -28,9 +27,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -65,6 +63,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..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 @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -60,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_flake.xml b/ccpp/suites/suite_FV3_GFS_v16_flake.xml index c11b2afdf..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 @@ -28,9 +27,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -66,6 +64,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..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 @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -58,6 +56,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..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 @@ -28,9 +27,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -65,6 +63,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..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 @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -62,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_GFS_v17_coupled_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml index bba0f5b78..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 @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -61,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_sfcocn.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml index 3d25ec17b..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 @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -59,6 +57,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..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 @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -62,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_FV3_GFS_v17_p8.xml b/ccpp/suites/suite_FV3_GFS_v17_p8.xml index 58f9431a8..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 @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -61,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_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml index 54258c15e..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -62,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_GFS_v17_p8_mynn.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml index e54c3ab06..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -63,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_rrtmgp.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml index 1bbd34def..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 @@ -24,9 +23,8 @@ GFS_rrtmgp_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -61,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_p8_ugwpv1.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml index 5ceab7c64..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 @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -61,6 +59,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..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 @@ -28,9 +27,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -65,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_gfdlmp_tedmf_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml index f2a02001e..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 @@ -28,9 +27,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -63,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_HAFS_v1_thompson.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml index 6a043e897..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 @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -60,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_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml index 5408b3898..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 @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -58,6 +56,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..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 @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -60,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_HRRR.xml b/ccpp/suites/suite_FV3_HRRR.xml index fabe94665..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -58,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_FV3_HRRR_c3.xml b/ccpp/suites/suite_FV3_HRRR_c3.xml index c0f3ec1f5..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -58,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_FV3_HRRR_gf.xml b/ccpp/suites/suite_FV3_HRRR_gf.xml index f3f227106..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -58,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_FV3_HRRR_gf_nogwd.xml b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml index 6b01cbd79..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -55,6 +53,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -58,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_FV3_RAP_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml index 7760b059c..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -59,6 +57,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -59,6 +57,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -59,6 +57,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -59,6 +57,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -60,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_RAP_sfcdiff.xml b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml index 7c2908a25..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -58,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_FV3_RAP_unified_ugwp.xml b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml index 6913b8e4a..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -59,6 +57,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -60,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_RRFS_v1nssl.xml b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml index 107254b18..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -60,6 +58,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -60,6 +58,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -60,6 +58,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -58,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_RRFS_sas_nogwd.xml b/ccpp/suites/suite_RRFS_sas_nogwd.xml index a68c1de3e..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -55,6 +53,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -59,6 +57,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -56,6 +54,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -56,6 +54,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -59,6 +57,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..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 @@ -25,9 +24,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -56,6 +54,10 @@ drag_suite GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3