diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py index 3b58a4bf2..128ae3a6e 100755 --- a/ccpp/config/ccpp_prebuild_config.py +++ b/ccpp/config/ccpp_prebuild_config.py @@ -119,8 +119,6 @@ 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.F90' , 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.F90' , 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.F90' , - 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.F90', - 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.F90', 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.F90' , 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.F90' , 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.F90' , diff --git a/ccpp/physics b/ccpp/physics index addf7c699..fce2a4eb6 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit addf7c699e6f9b9ef9bcc70c8d3360f057d833f2 +Subproject commit fce2a4eb6e3ae016516d78ed78676c3f235d9031 diff --git a/ccpp/suites/suite_HAFS_v0_hwrf.xml b/ccpp/suites/suite_HAFS_v0_hwrf.xml index 1b71266eb..99aca3b61 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf.xml +++ b/ccpp/suites/suite_HAFS_v0_hwrf.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rrtmg_lw @@ -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 GFS_DCNV_generic_pre get_phi_fv3 diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml b/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml index 705b5942e..e59644e6c 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml +++ b/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rrtmg_lw @@ -23,9 +22,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -41,6 +39,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry GFS_DCNV_generic_pre get_phi_fv3 diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml b/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml index 906912919..ddcb1c5ea 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml +++ b/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface @@ -25,9 +24,8 @@ - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -62,6 +60,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry GFS_DCNV_generic_pre get_phi_fv3 diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml b/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml index b4d01df6d..999441d5c 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml +++ b/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml @@ -12,7 +12,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface @@ -25,9 +24,8 @@ - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -43,6 +41,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry GFS_DCNV_generic_pre get_phi_fv3 diff --git a/ccpp/suites/suite_SCM_GFS_v15p2.xml b/ccpp/suites/suite_SCM_GFS_v15p2.xml index f5b6afea0..69568c9b7 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,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_SCM_GFS_v15p2_ACM_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml index 97d026929..0a6160c3c 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -40,6 +38,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_SCM_GFS_v15p2_FA.xml b/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml index 2c4a6ba04..a6fb76b2a 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,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_SCM_GFS_v15p2_MYJ.xml b/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml index 7a1221e82..d4893f6da 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,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_SCM_GFS_v15p2_RRTMGP.xml b/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml index 700d6a3f5..9ef501419 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmgp_pre GFS_radiation_surface GFS_rrtmgp_cloud_mp @@ -23,9 +22,8 @@ GFS_rrtmgp_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_SCM_GFS_v15p2_RRTMGP_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml index 03f602f86..394da362f 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmgp_pre GFS_radiation_surface GFS_rrtmgp_cloud_mp @@ -23,9 +22,8 @@ GFS_rrtmgp_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -41,6 +39,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_SCM_GFS_v15p2_YSU_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml index aeb6bceab..71b122517 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -40,6 +38,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_SCM_GFS_v15p2_no_nsst.xml b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml index 4ab952c2e..cf9bac16b 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -57,6 +55,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_SCM_GFS_v15p2_no_nsst_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml index 226651ec5..6dec9c37f 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -40,6 +38,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_SCM_GFS_v15p2_noahmp.xml b/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml index 18425531a..a92065943 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,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_SCM_GFS_v15p2_ntiedtke.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ntiedtke.xml index f0fbe5771..2f8fadb11 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_ntiedtke.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_ntiedtke.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_SCM_GFS_v15p2_ntiedtke_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ntiedtke_ps.xml index 414153038..7a69c4aae 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_ntiedtke_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_ntiedtke_ps.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 @@ -41,6 +39,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_SCM_GFS_v15p2_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml index e474cdf3f..b0ad468e7 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -40,6 +38,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_SCM_GFS_v15p2_saYSU_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml index 2e613b132..1fad9b5d3 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -40,6 +38,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_SCM_GFS_v16.xml b/ccpp/suites/suite_SCM_GFS_v16.xml index 723659ab3..24514d2fe 100644 --- a/ccpp/suites/suite_SCM_GFS_v16.xml +++ b/ccpp/suites/suite_SCM_GFS_v16.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,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_SCM_GFS_v16_RRTMGP.xml b/ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml index 174d07734..625f28e47 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmgp_pre GFS_radiation_surface GFS_rrtmgp_cloud_mp @@ -23,9 +22,8 @@ GFS_rrtmgp_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_SCM_GFS_v16_RRTMGP_ps.xml b/ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml index 4d8b8e8a6..770eef005 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmgp_pre GFS_radiation_surface GFS_rrtmgp_cloud_mp @@ -23,9 +22,8 @@ GFS_rrtmgp_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -41,6 +39,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_SCM_GFS_v16_debug.xml b/ccpp/suites/suite_SCM_GFS_v16_debug.xml index a7643d83c..06217cd6a 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_debug.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_debug.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,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_SCM_GFS_v16_debug_ps.xml b/ccpp/suites/suite_SCM_GFS_v16_debug_ps.xml index 4789c6cad..c60e5cc9f 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_debug_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_debug_ps.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -40,6 +38,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_SCM_GFS_v16_no_nsst.xml b/ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml index 77d4d613f..0db8c7b20 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -57,6 +55,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_SCM_GFS_v16_no_nsst_ps.xml b/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml index e8a247683..b51316b68 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -40,6 +38,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_SCM_GFS_v16_ps.xml b/ccpp/suites/suite_SCM_GFS_v16_ps.xml index 98d24e590..bb0cb534f 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_ps.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -40,6 +38,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_SCM_GFS_v16_ugwpv1.xml b/ccpp/suites/suite_SCM_GFS_v16_ugwpv1.xml index 0e7a06823..565b0dce5 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_ugwpv1.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_ugwpv1.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre @@ -22,9 +21,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -59,6 +57,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_SCM_GFS_v17_p8.xml b/ccpp/suites/suite_SCM_GFS_v17_p8.xml index 49662418d..206775073 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8.xml +++ b/ccpp/suites/suite_SCM_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 @@ -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_SCM_GFS_v17_p8_c3.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml index a984aab62..0d5f311bd 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml +++ b/ccpp/suites/suite_SCM_GFS_v17_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 @@ -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_SCM_GFS_v17_p8_c3_ps.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.xml index eee4317c7..224b39d3d 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.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 @@ -41,6 +39,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_SCM_GFS_v17_p8_ps.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml index 68d4970eb..d13d03125 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v17_p8_ps.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 @@ -41,6 +39,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_SCM_GFS_v17_p8_ugwpv1.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1.xml index e39f865a8..e759d30d9 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1.xml +++ b/ccpp/suites/suite_SCM_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 @@ -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_SCM_GFS_v17_p8_ugwpv1_no_nsst.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_no_nsst.xml index b7747dd26..ccfe55608 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_no_nsst.xml +++ b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_no_nsst.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 @@ 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_SCM_GFS_v17_p8_ugwpv1_no_nsst_ps.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_no_nsst_ps.xml index 206b95195..8ab0f5100 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_no_nsst_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_no_nsst_ps.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 @@ -41,6 +39,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_SCM_GFS_v17_p8_ugwpv1_ps.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_ps.xml index b0dd07353..b68c0ea3b 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_ps.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 @@ -41,6 +39,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_SCM_GSD_v1.xml b/ccpp/suites/suite_SCM_GSD_v1.xml index ae48d3ef1..3eec36f8f 100644 --- a/ccpp/suites/suite_SCM_GSD_v1.xml +++ b/ccpp/suites/suite_SCM_GSD_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 @@ -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_SCM_GSD_v1_ps.xml b/ccpp/suites/suite_SCM_GSD_v1_ps.xml index 94d72810e..0fef261c1 100644 --- a/ccpp/suites/suite_SCM_GSD_v1_ps.xml +++ b/ccpp/suites/suite_SCM_GSD_v1_ps.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 @@ -41,6 +39,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_SCM_GSD_v1nssl.xml b/ccpp/suites/suite_SCM_GSD_v1nssl.xml index f77b5eba6..b689421f2 100644 --- a/ccpp/suites/suite_SCM_GSD_v1nssl.xml +++ b/ccpp/suites/suite_SCM_GSD_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 @@ -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_SCM_GSD_v1nssl_ps.xml b/ccpp/suites/suite_SCM_GSD_v1nssl_ps.xml index 88fc1e8fa..3057bd829 100644 --- a/ccpp/suites/suite_SCM_GSD_v1nssl_ps.xml +++ b/ccpp/suites/suite_SCM_GSD_v1nssl_ps.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 @@ -41,6 +39,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_SCM_HRRR.xml b/ccpp/suites/suite_SCM_HRRR.xml index 57912f78a..f72d0292c 100644 --- a/ccpp/suites/suite_SCM_HRRR.xml +++ b/ccpp/suites/suite_SCM_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 @@ -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_SCM_HRRR_gf.xml b/ccpp/suites/suite_SCM_HRRR_gf.xml index e4637008b..32bcfdd71 100644 --- a/ccpp/suites/suite_SCM_HRRR_gf.xml +++ b/ccpp/suites/suite_SCM_HRRR_gf.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -24,9 +23,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -57,6 +55,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_SCM_HRRR_gf_ps.xml b/ccpp/suites/suite_SCM_HRRR_gf_ps.xml index 1329f4b97..a111c0677 100644 --- a/ccpp/suites/suite_SCM_HRRR_gf_ps.xml +++ b/ccpp/suites/suite_SCM_HRRR_gf_ps.xml @@ -11,7 +11,6 @@ - GFS_suite_interstitial_rad_reset sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface @@ -24,9 +23,8 @@ GFS_rrtmg_post - + - GFS_suite_interstitial_phys_reset GFS_suite_stateout_reset get_prs_fv3 GFS_suite_interstitial_1 @@ -41,6 +39,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_SCM_HRRR_ps.xml b/ccpp/suites/suite_SCM_HRRR_ps.xml index 0ac6c29ff..24b3c4190 100644 --- a/ccpp/suites/suite_SCM_HRRR_ps.xml +++ b/ccpp/suites/suite_SCM_HRRR_ps.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 @@ -40,6 +38,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_SCM_RAP.xml b/ccpp/suites/suite_SCM_RAP.xml index 62e945e1e..7ccaada08 100644 --- a/ccpp/suites/suite_SCM_RAP.xml +++ b/ccpp/suites/suite_SCM_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_SCM_RAP_ps.xml b/ccpp/suites/suite_SCM_RAP_ps.xml index 4149acba5..5b1feedda 100644 --- a/ccpp/suites/suite_SCM_RAP_ps.xml +++ b/ccpp/suites/suite_SCM_RAP_ps.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 @@ -40,6 +38,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_SCM_RRFS_v1alpha.xml b/ccpp/suites/suite_SCM_RRFS_v1alpha.xml index 8a6e99e05..755e97440 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1alpha.xml +++ b/ccpp/suites/suite_SCM_RRFS_v1alpha.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_SCM_RRFS_v1alpha_ps.xml b/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml index 5e6f6e34a..d690ff1aa 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml +++ b/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.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 @@ -41,6 +39,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_SCM_RRFS_v1beta.xml b/ccpp/suites/suite_SCM_RRFS_v1beta.xml index 4e87c32cc..078cfac1c 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1beta.xml +++ b/ccpp/suites/suite_SCM_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_SCM_RRFS_v1beta_no_nsst.xml b/ccpp/suites/suite_SCM_RRFS_v1beta_no_nsst.xml index b89d23786..3c860a9de 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1beta_no_nsst.xml +++ b/ccpp/suites/suite_SCM_RRFS_v1beta_no_nsst.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 @@ 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_SCM_RRFS_v1beta_no_nsst_ps.xml b/ccpp/suites/suite_SCM_RRFS_v1beta_no_nsst_ps.xml index 083e0bf17..8a2dbc12f 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1beta_no_nsst_ps.xml +++ b/ccpp/suites/suite_SCM_RRFS_v1beta_no_nsst_ps.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 @@ -41,6 +39,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_SCM_RRFS_v1beta_ps.xml b/ccpp/suites/suite_SCM_RRFS_v1beta_ps.xml index d663d450b..3cc0a077d 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1beta_ps.xml +++ b/ccpp/suites/suite_SCM_RRFS_v1beta_ps.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 @@ -41,6 +39,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_SCM_RRFS_v1nssl.xml b/ccpp/suites/suite_SCM_RRFS_v1nssl.xml index 926a5e12a..a9ab1138e 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1nssl.xml +++ b/ccpp/suites/suite_SCM_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 diff --git a/ccpp/suites/suite_SCM_WoFS_v0.xml b/ccpp/suites/suite_SCM_WoFS_v0.xml index 87a728561..154dfcc86 100644 --- a/ccpp/suites/suite_SCM_WoFS_v0.xml +++ b/ccpp/suites/suite_SCM_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_SCM_WoFS_v0_ps.xml b/ccpp/suites/suite_SCM_WoFS_v0_ps.xml index 24948795e..9ce307b2b 100644 --- a/ccpp/suites/suite_SCM_WoFS_v0_ps.xml +++ b/ccpp/suites/suite_SCM_WoFS_v0_ps.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 @@ -41,6 +39,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_SCM_csawmg.xml b/ccpp/suites/suite_SCM_csawmg.xml index a0b541b3c..fd1dcdd60 100644 --- a/ccpp/suites/suite_SCM_csawmg.xml +++ b/ccpp/suites/suite_SCM_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_SCM_csawmg_ps.xml b/ccpp/suites/suite_SCM_csawmg_ps.xml index 44e09e6f0..61fc09601 100644 --- a/ccpp/suites/suite_SCM_csawmg_ps.xml +++ b/ccpp/suites/suite_SCM_csawmg_ps.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 @@ -41,6 +39,10 @@ cires_ugwp_post GFS_GWD_generic_post GFS_suite_stateout_update + + + + GFS_photochemistry get_phi_fv3 GFS_suite_interstitial_3 diff --git a/scm/src/scm.F90 b/scm/src/scm.F90 index e5aab8983..4b8acdb0d 100644 --- a/scm/src/scm.F90 +++ b/scm/src/scm.F90 @@ -309,10 +309,27 @@ subroutine scm_main_sub() if (mod(physics%Model%kdt,physics%Model%nszero) == 1 .or. physics%Model%nszero == 1) then call physics%Diag%phys_zero (physics%Model) endif - - call ccpp_physics_run(cdata, suite_name=trim(adjustl(scm_state%physics_suite_name)), ierr=ierr) + + !CCPP run phase + ! time_vary group doesn't have any run phase (omitted) + ! radiation group + call physics%Interstitial(1)%rad_reset(physics%Model) + call ccpp_physics_run(cdata, suite_name=trim(adjustl(scm_state%physics_suite_name)), group_name="radiation", ierr=ierr) + if (ierr/=0) then + write(*,'(a,i0,a)') 'An error occurred in ccpp_physics_run for group radiation: ' // trim(cdata%errmsg) // '. Exiting...' + error stop + end if + ! process-split physics + call physics%Interstitial(1)%phys_reset(physics%Model) + call ccpp_physics_run(cdata, suite_name=trim(adjustl(scm_state%physics_suite_name)), group_name="phys_ps", ierr=ierr) + if (ierr/=0) then + write(*,'(a,i0,a)') 'An error occurred in ccpp_physics_run for group phys_ps: ' // trim(cdata%errmsg) // '. Exiting...' + error stop + end if + ! time-split physics + call ccpp_physics_run(cdata, suite_name=trim(adjustl(scm_state%physics_suite_name)), group_name="phys_ts", ierr=ierr) if (ierr/=0) then - write(*,'(a,i0,a)') 'An error occurred in ccpp_physics_run: ' // trim(cdata%errmsg) // '. Exiting...' + write(*,'(a,i0,a)') 'An error occurred in ccpp_physics_run for group phys_ts: ' // trim(cdata%errmsg) // '. Exiting...' error stop end if diff --git a/scm/src/scm_time_integration.F90 b/scm/src/scm_time_integration.F90 index 895d70435..3956d40d1 100644 --- a/scm/src/scm_time_integration.F90 +++ b/scm/src/scm_time_integration.F90 @@ -154,11 +154,28 @@ subroutine do_time_step(scm_state, physics, cdata, in_spinup) if (mod(physics%Model%kdt,physics%Model%nszero) == 1 .or. physics%Model%nszero == 1) then call physics%Diag%phys_zero (physics%Model) endif - - call ccpp_physics_run(cdata, suite_name=trim(adjustl(scm_state%physics_suite_name)), ierr=ierr) + + !CCPP run phase + ! time_vary group doesn't have any run phase (omitted) + ! radiation group + call physics%Interstitial(1)%rad_reset(physics%Model) + call ccpp_physics_run(cdata, suite_name=trim(adjustl(scm_state%physics_suite_name)), group_name="radiation", ierr=ierr) if (ierr/=0) then - write(*,'(a,i0,a)') 'An error occurred in ccpp_physics_run: ' // trim(cdata%errmsg) // '. Exiting...' - error stop trim(cdata%errmsg) + write(*,'(a,i0,a)') 'An error occurred in ccpp_physics_run for group radiation: ' // trim(cdata%errmsg) // '. Exiting...' + error stop + end if + ! process-split physics + call physics%Interstitial(1)%phys_reset(physics%Model) + call ccpp_physics_run(cdata, suite_name=trim(adjustl(scm_state%physics_suite_name)), group_name="phys_ps", ierr=ierr) + if (ierr/=0) then + write(*,'(a,i0,a)') 'An error occurred in ccpp_physics_run for group phys_ps: ' // trim(cdata%errmsg) // '. Exiting...' + error stop + end if + ! time-split physics + call ccpp_physics_run(cdata, suite_name=trim(adjustl(scm_state%physics_suite_name)), group_name="phys_ts", ierr=ierr) + if (ierr/=0) then + write(*,'(a,i0,a)') 'An error occurred in ccpp_physics_run for group phys_ts: ' // trim(cdata%errmsg) // '. Exiting...' + error stop end if call ccpp_physics_timestep_finalize(cdata, suite_name=trim(adjustl(scm_state%physics_suite_name)), ierr=ierr)