Skip to content

Commit 6ea19b6

Browse files
grantfirlgrantfirl
committed
modify remaining SDFs and remove obsolete interstitial schemes
1 parent c67ce15 commit 6ea19b6

File tree

54 files changed

+71
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+71
-266
lines changed

‎ccpp/config/ccpp_prebuild_config.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,12 @@
9595
# Relative path to source (from where ccpp_prebuild.py is called) : [ list of physics sets in which scheme may be called ];
9696
# current restrictions are that each scheme can only belong to one physics set, and all schemes within one group in the
9797
# suite definition file have to belong to the same physics set
98-
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.F90' ,
9998
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.F90' ,
10099
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.F90' ,
101100
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_post.F90' ,
102-
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_pre.F90' ,
103101
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90' ,
104102
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.F90' ,
105103
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.F90' ,
106-
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.F90' ,
107104
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.F90' ,
108105
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90' ,
109106
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.F90' ,
@@ -122,8 +119,6 @@
122119
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.F90' ,
123120
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.F90' ,
124121
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.F90' ,
125-
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.F90' ,
126-
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_update.F90' ,
127122
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.F90' ,
128123
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.F90' ,
129124
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.F90' ,

‎ccpp/suites/suite_HAFS_v0_hwrf.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
</group>
2525
<group name="phys_ps">
2626
<subcycle loop="1">
27-
<scheme>GFS_suite_stateout_reset</scheme>
2827
<scheme>get_prs_fv3</scheme>
2928
<scheme>GFS_suite_interstitial_1</scheme>
3029
<scheme>GFS_surface_generic_pre</scheme>
@@ -57,23 +56,20 @@
5756
<scheme>cires_ugwp</scheme>
5857
<scheme>cires_ugwp_post</scheme>
5958
<scheme>GFS_GWD_generic_post</scheme>
60-
<scheme>GFS_suite_stateout_update</scheme>
6159
</subcycle>
6260
</group>
6361
<group name="phys_ts">
6462
<subcycle loop="1">
6563
<scheme>GFS_photochemistry</scheme>
66-
<scheme>GFS_DCNV_generic_pre</scheme>
64+
<scheme>GFS_photochemistry_post</scheme>
6765
<scheme>get_phi_fv3</scheme>
6866
<scheme>GFS_suite_interstitial_3</scheme>
6967
<scheme>samfdeepcnv</scheme>
7068
<scheme>GFS_DCNV_generic_post</scheme>
71-
<scheme>GFS_SCNV_generic_pre</scheme>
7269
<scheme>samfshalcnv</scheme>
7370
<scheme>GFS_SCNV_generic_post</scheme>
7471
<scheme>GFS_suite_interstitial_4</scheme>
7572
<scheme>cnvc90</scheme>
76-
<scheme>GFS_MP_generic_pre</scheme>
7773
<scheme>mp_fer_hires</scheme>
7874
<scheme>GFS_MP_generic_post</scheme>
7975
<scheme>maximum_hourly_diagnostics</scheme>

‎ccpp/suites/suite_HAFS_v0_hwrf_ps.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
</group>
2525
<group name="phys_ps">
2626
<subcycle loop="1">
27-
<scheme>GFS_suite_stateout_reset</scheme>
2827
<scheme>get_prs_fv3</scheme>
2928
<scheme>GFS_suite_interstitial_1</scheme>
3029
<scheme>GFS_surface_generic_pre</scheme>
@@ -38,13 +37,12 @@
3837
<scheme>cires_ugwp</scheme>
3938
<scheme>cires_ugwp_post</scheme>
4039
<scheme>GFS_GWD_generic_post</scheme>
41-
<scheme>GFS_suite_stateout_update</scheme>
4240
</subcycle>
4341
</group>
4442
<group name="phys_ts">
4543
<subcycle loop="1">
4644
<scheme>GFS_photochemistry</scheme>
47-
<scheme>GFS_DCNV_generic_pre</scheme>
45+
<scheme>GFS_photochemistry_post</scheme>
4846
<scheme>get_phi_fv3</scheme>
4947
<scheme>GFS_suite_interstitial_3</scheme>
5048
<scheme>samfdeepcnv</scheme>
@@ -54,7 +52,6 @@
5452
<scheme>GFS_SCNV_generic_post</scheme>
5553
<scheme>GFS_suite_interstitial_4</scheme>
5654
<scheme>cnvc90</scheme>
57-
<scheme>GFS_MP_generic_pre</scheme>
5855
<scheme>mp_fer_hires</scheme>
5956
<scheme>GFS_MP_generic_post</scheme>
6057
<scheme>maximum_hourly_diagnostics</scheme>

‎ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
</group>
2727
<group name="phys_ps">
2828
<subcycle loop="1">
29-
<scheme>GFS_suite_stateout_reset</scheme>
3029
<scheme>get_prs_fv3</scheme>
3130
<scheme>GFS_suite_interstitial_1</scheme>
3231
<scheme>GFS_surface_generic_pre</scheme>
@@ -59,24 +58,20 @@
5958
<scheme>cires_ugwp</scheme>
6059
<scheme>cires_ugwp_post</scheme>
6160
<scheme>GFS_GWD_generic_post</scheme>
62-
<scheme>GFS_suite_stateout_update</scheme>
6361
</subcycle>
6462
</group>
6563
<group name="phys_ts">
6664
<subcycle loop="1">
6765
<scheme>GFS_photochemistry</scheme>
68-
<scheme>GFS_DCNV_generic_pre</scheme>
66+
<scheme>GFS_photochemistry_post</scheme>
6967
<scheme>get_phi_fv3</scheme>
7068
<scheme>GFS_suite_interstitial_3</scheme>
7169
<scheme>samfdeepcnv</scheme>
7270
<scheme>GFS_DCNV_generic_post</scheme>
73-
<scheme>GFS_SCNV_generic_pre</scheme>
7471
<scheme>samfshalcnv</scheme>
7572
<scheme>GFS_SCNV_generic_post</scheme>
7673
<scheme>GFS_suite_interstitial_4</scheme>
7774
<scheme>cnvc90</scheme>
78-
<scheme>GFS_MP_generic_pre</scheme>
79-
<scheme>mp_thompson_pre</scheme>
8075
<scheme>mp_thompson</scheme>
8176
<scheme>mp_thompson_post</scheme>
8277
<scheme>GFS_MP_generic_post</scheme>

‎ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
</group>
2727
<group name="phys_ps">
2828
<subcycle loop="1">
29-
<scheme>GFS_suite_stateout_reset</scheme>
3029
<scheme>get_prs_fv3</scheme>
3130
<scheme>GFS_suite_interstitial_1</scheme>
3231
<scheme>GFS_surface_generic_pre</scheme>
@@ -40,24 +39,20 @@
4039
<scheme>cires_ugwp</scheme>
4140
<scheme>cires_ugwp_post</scheme>
4241
<scheme>GFS_GWD_generic_post</scheme>
43-
<scheme>GFS_suite_stateout_update</scheme>
4442
</subcycle>
4543
</group>
4644
<group name="phys_ts">
4745
<subcycle loop="1">
4846
<scheme>GFS_photochemistry</scheme>
49-
<scheme>GFS_DCNV_generic_pre</scheme>
47+
<scheme>GFS_photochemistry_post</scheme>
5048
<scheme>get_phi_fv3</scheme>
5149
<scheme>GFS_suite_interstitial_3</scheme>
5250
<scheme>samfdeepcnv</scheme>
5351
<scheme>GFS_DCNV_generic_post</scheme>
54-
<scheme>GFS_SCNV_generic_pre</scheme>
5552
<scheme>samfshalcnv</scheme>
5653
<scheme>GFS_SCNV_generic_post</scheme>
5754
<scheme>GFS_suite_interstitial_4</scheme>
5855
<scheme>cnvc90</scheme>
59-
<scheme>GFS_MP_generic_pre</scheme>
60-
<scheme>mp_thompson_pre</scheme>
6156
<scheme>mp_thompson</scheme>
6257
<scheme>mp_thompson_post</scheme>
6358
<scheme>GFS_MP_generic_post</scheme>

‎ccpp/suites/suite_SCM_GFS_v15p2.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
</group>
2424
<group name="phys_ps">
2525
<subcycle loop="1">
26-
<scheme>GFS_suite_stateout_reset</scheme>
2726
<scheme>get_prs_fv3</scheme>
2827
<scheme>GFS_suite_interstitial_1</scheme>
2928
<scheme>GFS_surface_generic_pre</scheme>
@@ -56,23 +55,20 @@
5655
<scheme>cires_ugwp</scheme>
5756
<scheme>cires_ugwp_post</scheme>
5857
<scheme>GFS_GWD_generic_post</scheme>
59-
<scheme>GFS_suite_stateout_update</scheme>
6058
</subcycle>
6159
</group>
6260
<group name="phys_ts">
6361
<subcycle loop="1">
6462
<scheme>GFS_photochemistry</scheme>
63+
<scheme>GFS_photochemistry_post</scheme>
6564
<scheme>get_phi_fv3</scheme>
6665
<scheme>GFS_suite_interstitial_3</scheme>
67-
<scheme>GFS_DCNV_generic_pre</scheme>
6866
<scheme>samfdeepcnv</scheme>
6967
<scheme>GFS_DCNV_generic_post</scheme>
70-
<scheme>GFS_SCNV_generic_pre</scheme>
7168
<scheme>samfshalcnv</scheme>
7269
<scheme>GFS_SCNV_generic_post</scheme>
7370
<scheme>GFS_suite_interstitial_4</scheme>
7471
<scheme>cnvc90</scheme>
75-
<scheme>GFS_MP_generic_pre</scheme>
7672
<scheme>gfdl_cloud_microphys</scheme>
7773
<scheme>GFS_MP_generic_post</scheme>
7874
<scheme>maximum_hourly_diagnostics</scheme>

‎ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
</group>
2424
<group name="phys_ps">
2525
<subcycle loop="1">
26-
<scheme>GFS_suite_stateout_reset</scheme>
2726
<scheme>get_prs_fv3</scheme>
2827
<scheme>GFS_suite_interstitial_1</scheme>
2928
<scheme>GFS_surface_generic_pre</scheme>
@@ -37,23 +36,20 @@
3736
<scheme>cires_ugwp</scheme>
3837
<scheme>cires_ugwp_post</scheme>
3938
<scheme>GFS_GWD_generic_post</scheme>
40-
<scheme>GFS_suite_stateout_update</scheme>
4139
</subcycle>
4240
</group>
4341
<group name="phys_ts">
4442
<subcycle loop="1">
4543
<scheme>GFS_photochemistry</scheme>
44+
<scheme>GFS_photochemistry_post</scheme>
4645
<scheme>get_phi_fv3</scheme>
4746
<scheme>GFS_suite_interstitial_3</scheme>
48-
<scheme>GFS_DCNV_generic_pre</scheme>
4947
<scheme>samfdeepcnv</scheme>
5048
<scheme>GFS_DCNV_generic_post</scheme>
51-
<scheme>GFS_SCNV_generic_pre</scheme>
5249
<scheme>samfshalcnv</scheme>
5350
<scheme>GFS_SCNV_generic_post</scheme>
5451
<scheme>GFS_suite_interstitial_4</scheme>
5552
<scheme>cnvc90</scheme>
56-
<scheme>GFS_MP_generic_pre</scheme>
5753
<scheme>gfdl_cloud_microphys</scheme>
5854
<scheme>GFS_MP_generic_post</scheme>
5955
<scheme>maximum_hourly_diagnostics</scheme>

‎ccpp/suites/suite_SCM_GFS_v15p2_FA.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
</group>
2424
<group name="phys_ps">
2525
<subcycle loop="1">
26-
<scheme>GFS_suite_stateout_reset</scheme>
2726
<scheme>get_prs_fv3</scheme>
2827
<scheme>GFS_suite_interstitial_1</scheme>
2928
<scheme>GFS_surface_generic_pre</scheme>
@@ -56,23 +55,20 @@
5655
<scheme>cires_ugwp</scheme>
5756
<scheme>cires_ugwp_post</scheme>
5857
<scheme>GFS_GWD_generic_post</scheme>
59-
<scheme>GFS_suite_stateout_update</scheme>
6058
</subcycle>
6159
</group>
6260
<group name="phys_ts">
6361
<subcycle loop="1">
6462
<scheme>GFS_photochemistry</scheme>
63+
<scheme>GFS_photochemistry_post</scheme>
6564
<scheme>get_phi_fv3</scheme>
6665
<scheme>GFS_suite_interstitial_3</scheme>
67-
<scheme>GFS_DCNV_generic_pre</scheme>
6866
<scheme>samfdeepcnv</scheme>
6967
<scheme>GFS_DCNV_generic_post</scheme>
70-
<scheme>GFS_SCNV_generic_pre</scheme>
7168
<scheme>samfshalcnv</scheme>
7269
<scheme>GFS_SCNV_generic_post</scheme>
7370
<scheme>GFS_suite_interstitial_4</scheme>
7471
<scheme>cnvc90</scheme>
75-
<scheme>GFS_MP_generic_pre</scheme>
7672
<scheme>mp_fer_hires</scheme>
7773
<scheme>GFS_MP_generic_post</scheme>
7874
<scheme>maximum_hourly_diagnostics</scheme>

‎ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
</group>
2424
<group name="phys_ps">
2525
<subcycle loop="1">
26-
<scheme>GFS_suite_stateout_reset</scheme>
2726
<scheme>get_prs_fv3</scheme>
2827
<scheme>GFS_suite_interstitial_1</scheme>
2928
<scheme>GFS_surface_generic_pre</scheme>
@@ -56,23 +55,20 @@
5655
<scheme>cires_ugwp</scheme>
5756
<scheme>cires_ugwp_post</scheme>
5857
<scheme>GFS_GWD_generic_post</scheme>
59-
<scheme>GFS_suite_stateout_update</scheme>
6058
</subcycle>
6159
</group>
6260
<group name="phys_ts">
6361
<subcycle loop="1">
6462
<scheme>GFS_photochemistry</scheme>
63+
<scheme>GFS_photochemistry_post</scheme>
6564
<scheme>get_phi_fv3</scheme>
6665
<scheme>GFS_suite_interstitial_3</scheme>
67-
<scheme>GFS_DCNV_generic_pre</scheme>
6866
<scheme>samfdeepcnv</scheme>
6967
<scheme>GFS_DCNV_generic_post</scheme>
70-
<scheme>GFS_SCNV_generic_pre</scheme>
7168
<scheme>samfshalcnv</scheme>
7269
<scheme>GFS_SCNV_generic_post</scheme>
7370
<scheme>GFS_suite_interstitial_4</scheme>
7471
<scheme>cnvc90</scheme>
75-
<scheme>GFS_MP_generic_pre</scheme>
7672
<scheme>gfdl_cloud_microphys</scheme>
7773
<scheme>GFS_MP_generic_post</scheme>
7874
<scheme>maximum_hourly_diagnostics</scheme>

‎ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
</group>
2525
<group name="phys_ps">
2626
<subcycle loop="1">
27-
<scheme>GFS_suite_stateout_reset</scheme>
2827
<scheme>get_prs_fv3</scheme>
2928
<scheme>GFS_suite_interstitial_1</scheme>
3029
<scheme>GFS_surface_generic_pre</scheme>
@@ -57,23 +56,20 @@
5756
<scheme>cires_ugwp</scheme>
5857
<scheme>cires_ugwp_post</scheme>
5958
<scheme>GFS_GWD_generic_post</scheme>
60-
<scheme>GFS_suite_stateout_update</scheme>
6159
</subcycle>
6260
</group>
6361
<group name="phys_ts">
6462
<subcycle loop="1">
6563
<scheme>GFS_photochemistry</scheme>
64+
<scheme>GFS_photochemistry_post</scheme>
6665
<scheme>get_phi_fv3</scheme>
6766
<scheme>GFS_suite_interstitial_3</scheme>
68-
<scheme>GFS_DCNV_generic_pre</scheme>
6967
<scheme>samfdeepcnv</scheme>
7068
<scheme>GFS_DCNV_generic_post</scheme>
71-
<scheme>GFS_SCNV_generic_pre</scheme>
7269
<scheme>samfshalcnv</scheme>
7370
<scheme>GFS_SCNV_generic_post</scheme>
7471
<scheme>GFS_suite_interstitial_4</scheme>
7572
<scheme>cnvc90</scheme>
76-
<scheme>GFS_MP_generic_pre</scheme>
7773
<scheme>gfdl_cloud_microphys</scheme>
7874
<scheme>GFS_MP_generic_post</scheme>
7975
<scheme>maximum_hourly_diagnostics</scheme>

0 commit comments

Comments
 (0)