Skip to content

Commit c156e02

Browse files
DomHeinzellerDomHeinzeller
committed
Removed _run suffix from schemes in current SDFs
1 parent 907d1cd commit c156e02

File tree

3 files changed

+163
-163
lines changed

3 files changed

+163
-163
lines changed

‎examples/suite_FV3_test.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<suite name="FV3_test" lib="ccppphys" ver="1">
4-
<init>FV3_test_init</init>
4+
<!-- <init></init> -->
55
<group name="fast_physics">
66
<subcycle loop="1">
7-
<scheme>FV3_test_run</scheme>
7+
<scheme>FV3_test</scheme>
88
</subcycle>
99
</group>
1010
<group name="physics">
1111
<subcycle loop="1">
12-
<scheme>cnvc90_run</scheme>
12+
<scheme>cnvc90</scheme>
1313
</subcycle>
1414
</group>
15-
<finalize>FV3_test_finalize</finalize>
15+
<!-- <finalize></finalize> -->
1616
</suite>

‎examples/suite_GFS_operational_2017.xml

+79-79
Original file line numberDiff line numberDiff line change
@@ -9,97 +9,97 @@
99
</group>
1010
<group name="radiation">
1111
<subcycle loop="1">
12-
<scheme>GFS_suite_interstitial_rad_reset_run</scheme>
13-
<scheme>GFS_rrtmg_pre_run</scheme>
14-
<scheme>rrtmg_sw_pre_run</scheme>
15-
<scheme>rrtmg_sw_run</scheme>
16-
<scheme>rrtmg_sw_post_run</scheme>
17-
<scheme>rrtmg_lw_pre_run</scheme>
18-
<scheme>rrtmg_lw_run</scheme>
19-
<scheme>rrtmg_lw_post_run</scheme>
20-
<scheme>GFS_rrtmg_post_run</scheme>
21-
<!-- <scheme>memcheck_run</scheme> -->
22-
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
23-
<!-- <scheme>GFS_interstitialtoscreen_run</scheme> -->
12+
<scheme>GFS_suite_interstitial_rad_reset</scheme>
13+
<scheme>GFS_rrtmg_pre</scheme>
14+
<scheme>rrtmg_sw_pre</scheme>
15+
<scheme>rrtmg_sw</scheme>
16+
<scheme>rrtmg_sw_post</scheme>
17+
<scheme>rrtmg_lw_pre</scheme>
18+
<scheme>rrtmg_lw</scheme>
19+
<scheme>rrtmg_lw_post</scheme>
20+
<scheme>GFS_rrtmg_post</scheme>
21+
<!-- <scheme>memcheck</scheme> -->
22+
<!-- <scheme>GFS_diagtoscreen</scheme> -->
23+
<!-- <scheme>GFS_interstitialtoscreen</scheme> -->
2424
</subcycle>
2525
</group>
2626
<group name="physics">
2727
<subcycle loop="1">
28-
<scheme>GFS_suite_interstitial_phys_reset_run</scheme>
29-
<scheme>get_prs_fv3_run</scheme>
30-
<scheme>GFS_suite_interstitial_1_run</scheme>
31-
<scheme>sfc_sice_pre_run</scheme>
32-
<scheme>dcyc2t3_run</scheme>
33-
<scheme>GFS_suite_interstitial_2_run</scheme>
34-
<scheme>GFS_surface_generic_pre_run</scheme>
35-
<scheme>GFS_PBL_generic_pre_run</scheme>
36-
<scheme>lsm_noah_pre_run</scheme>
28+
<scheme>GFS_suite_interstitial_phys_reset</scheme>
29+
<scheme>get_prs_fv3</scheme>
30+
<scheme>GFS_suite_interstitial_1</scheme>
31+
<scheme>sfc_sice_pre</scheme>
32+
<scheme>dcyc2t3</scheme>
33+
<scheme>GFS_suite_interstitial_2</scheme>
34+
<scheme>GFS_surface_generic_pre</scheme>
35+
<scheme>GFS_PBL_generic_pre</scheme>
36+
<scheme>lsm_noah_pre</scheme>
3737
<!-- DH* TODO - turn into a subsycle loop="2" construct? -->
3838
<!-- Surface iteration loop 1 -->
39-
<scheme>GFS_surface_loop_control_part0_run</scheme>
40-
<scheme>sfc_ex_coef_run</scheme>
41-
<scheme>GFS_surface_loop_control_part1_run</scheme>
42-
<scheme>sfc_nst_pre_run</scheme>
43-
<scheme>sfc_nst_run</scheme>
44-
<scheme>sfc_nst_post_run</scheme>
45-
<scheme>lsm_noah_run</scheme>
46-
<scheme>sfc_sice_run</scheme>
47-
<scheme>GFS_surface_loop_control_part2_run</scheme>
39+
<scheme>GFS_surface_loop_control_part0</scheme>
40+
<scheme>sfc_ex_coef</scheme>
41+
<scheme>GFS_surface_loop_control_part1</scheme>
42+
<scheme>sfc_nst_pre</scheme>
43+
<scheme>sfc_nst</scheme>
44+
<scheme>sfc_nst_post</scheme>
45+
<scheme>lsm_noah</scheme>
46+
<scheme>sfc_sice</scheme>
47+
<scheme>GFS_surface_loop_control_part2</scheme>
4848
<!-- Surface iteration loop 2 -->
49-
<scheme>GFS_surface_loop_control_part0_run</scheme>
50-
<scheme>sfc_ex_coef_run</scheme>
51-
<scheme>GFS_surface_loop_control_part1_run</scheme>
52-
<scheme>sfc_nst_pre_run</scheme>
53-
<scheme>sfc_nst_run</scheme>
54-
<scheme>sfc_nst_post_run</scheme>
55-
<scheme>lsm_noah_run</scheme>
56-
<scheme>sfc_sice_run</scheme>
57-
<scheme>GFS_surface_loop_control_part2_run</scheme>
49+
<scheme>GFS_surface_loop_control_part0</scheme>
50+
<scheme>sfc_ex_coef</scheme>
51+
<scheme>GFS_surface_loop_control_part1</scheme>
52+
<scheme>sfc_nst_pre</scheme>
53+
<scheme>sfc_nst</scheme>
54+
<scheme>sfc_nst_post</scheme>
55+
<scheme>lsm_noah</scheme>
56+
<scheme>sfc_sice</scheme>
57+
<scheme>GFS_surface_loop_control_part2</scheme>
5858
<!-- End of surface iteration loop -->
59-
<scheme>dcyc2t3_post_run</scheme>
60-
<scheme>sfc_diag_run</scheme>
61-
<scheme>GFS_surface_generic_post_run</scheme>
62-
<scheme>edmf_run</scheme>
63-
<scheme>GFS_PBL_generic_post_run</scheme>
64-
<scheme>gwdps_pre_run</scheme>
65-
<scheme>gwdps_run</scheme>
66-
<scheme>gwdps_post_run</scheme>
67-
<scheme>rayleigh_damp_run</scheme>
68-
<scheme>GFS_suite_update_stateout_run</scheme>
69-
<scheme>ozphys_run</scheme>
70-
<scheme>ozphys_post_run</scheme>
71-
<scheme>GFS_DCNV_generic_pre_run</scheme>
72-
<scheme>get_phi_fv3_run</scheme>
73-
<scheme>GFS_suite_interstitial_3_run</scheme>
74-
<scheme>GFS_zhao_carr_pre_run</scheme>
75-
<scheme>sasas_deep_run</scheme>
76-
<scheme>GFS_DCNV_generic_post_run</scheme>
77-
<scheme>gwdc_pre_run</scheme>
78-
<scheme>gwdc_run</scheme>
79-
<scheme>gwdc_post_run</scheme>
80-
<scheme>GFS_SCNV_generic_pre_run</scheme>
81-
<scheme>sasas_shal_run</scheme>
82-
<scheme>sasas_shal_post_run</scheme>
83-
<scheme>GFS_SCNV_generic_post_run</scheme>
84-
<scheme>cnvc90_run</scheme>
85-
<scheme>GFS_MP_generic_pre_run</scheme>
86-
<scheme>zhaocarr_gscond_run</scheme>
87-
<scheme>zhaocarr_precpd_run</scheme>
88-
<scheme>GFS_calpreciptype_run</scheme>
89-
<scheme>GFS_MP_generic_post_run</scheme>
90-
<scheme>sfc_diag_run</scheme>
91-
<scheme>lsm_noah_post_run</scheme>
92-
<scheme>sfc_sice_post_run</scheme>
93-
<!-- <scheme>memcheck_run</scheme> -->
94-
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
95-
<!-- <scheme>GFS_interstitialtoscreen_run</scheme> -->
59+
<scheme>dcyc2t3_post</scheme>
60+
<scheme>sfc_diag</scheme>
61+
<scheme>GFS_surface_generic_post</scheme>
62+
<scheme>edmf</scheme>
63+
<scheme>GFS_PBL_generic_post</scheme>
64+
<scheme>gwdps_pre</scheme>
65+
<scheme>gwdps</scheme>
66+
<scheme>gwdps_post</scheme>
67+
<scheme>rayleigh_damp</scheme>
68+
<scheme>GFS_suite_update_stateout</scheme>
69+
<scheme>ozphys</scheme>
70+
<scheme>ozphys_post</scheme>
71+
<scheme>GFS_DCNV_generic_pre</scheme>
72+
<scheme>get_phi_fv3</scheme>
73+
<scheme>GFS_suite_interstitial_3</scheme>
74+
<scheme>GFS_zhao_carr_pre</scheme>
75+
<scheme>sasas_deep</scheme>
76+
<scheme>GFS_DCNV_generic_post</scheme>
77+
<scheme>gwdc_pre</scheme>
78+
<scheme>gwdc</scheme>
79+
<scheme>gwdc_post</scheme>
80+
<scheme>GFS_SCNV_generic_pre</scheme>
81+
<scheme>sasas_shal</scheme>
82+
<scheme>sasas_shal_post</scheme>
83+
<scheme>GFS_SCNV_generic_post</scheme>
84+
<scheme>cnvc90</scheme>
85+
<scheme>GFS_MP_generic_pre</scheme>
86+
<scheme>zhaocarr_gscond</scheme>
87+
<scheme>zhaocarr_precpd</scheme>
88+
<scheme>GFS_calpreciptype</scheme>
89+
<scheme>GFS_MP_generic_post</scheme>
90+
<scheme>sfc_diag</scheme>
91+
<scheme>lsm_noah_post</scheme>
92+
<scheme>sfc_sice_post</scheme>
93+
<!-- <scheme>memcheck</scheme> -->
94+
<!-- <scheme>GFS_diagtoscreen</scheme> -->
95+
<!-- <scheme>GFS_interstitialtoscreen</scheme> -->
9696
</subcycle>
9797
</group>
9898
<group name="stochastics">
9999
<subcycle loop="1">
100-
<scheme>GFS_stochastics_run</scheme>
101-
<!-- <scheme>memcheck_run</scheme> -->
102-
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
100+
<scheme>GFS_stochastics</scheme>
101+
<!-- <scheme>memcheck</scheme> -->
102+
<!-- <scheme>GFS_diagtoscreen</scheme> -->
103103
</subcycle>
104104
</group>
105105
<finalize>IPD_finalize</finalize>

‎examples/suite_scm_GFS_test.xml

+80-80
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<suite name="GFS_operational_2017" lib="ccppphys" ver="1.0.0">
4-
<init>GFS_initialize_scm_run</init>
4+
<init>GFS_initialize_scm</init>
55
<group name="time_vary">
66
<subcycle loop="1">
7-
<scheme>GFS_phys_time_vary_1_run</scheme>
8-
<scheme>GFS_rad_time_vary_run</scheme>
9-
<scheme>GFS_phys_time_vary_2_run</scheme>
10-
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
7+
<scheme>GFS_phys_time_vary_1</scheme>
8+
<scheme>GFS_rad_time_vary</scheme>
9+
<scheme>GFS_phys_time_vary_2</scheme>
10+
<!-- <scheme>GFS_diagtoscreen</scheme> -->
1111
</subcycle>
1212
</group>
1313
<group name="radiation">
1414
<subcycle loop="1">
15-
<scheme>GFS_suite_interstitial_rad_reset_run</scheme>
16-
<scheme>GFS_rrtmg_pre_run</scheme>
17-
<scheme>rrtmg_sw_pre_run</scheme>
18-
<scheme>rrtmg_sw_run</scheme>
19-
<scheme>rrtmg_sw_post_run</scheme>
20-
<scheme>rrtmg_lw_pre_run</scheme>
21-
<scheme>rrtmg_lw_run</scheme>
22-
<scheme>rrtmg_lw_post_run</scheme>
23-
<scheme>GFS_rrtmg_post_run</scheme>
24-
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
25-
<!-- <scheme>GFS_interstitialtoscreen_run</scheme> -->
15+
<scheme>GFS_suite_interstitial_rad_reset</scheme>
16+
<scheme>GFS_rrtmg_pre</scheme>
17+
<scheme>rrtmg_sw_pre</scheme>
18+
<scheme>rrtmg_sw</scheme>
19+
<scheme>rrtmg_sw_post</scheme>
20+
<scheme>rrtmg_lw_pre</scheme>
21+
<scheme>rrtmg_lw</scheme>
22+
<scheme>rrtmg_lw_post</scheme>
23+
<scheme>GFS_rrtmg_post</scheme>
24+
<!-- <scheme>GFS_diagtoscreen</scheme> -->
25+
<!-- <scheme>GFS_interstitialtoscreen</scheme> -->
2626
</subcycle>
2727
</group>
2828
<group name="physics">
2929
<subcycle loop="1">
30-
<scheme>GFS_suite_interstitial_phys_reset_run</scheme>
31-
<scheme>get_prs_fv3_run</scheme>
32-
<scheme>GFS_suite_interstitial_1_run</scheme>
33-
<scheme>sfc_sice_pre_run</scheme>
34-
<scheme>dcyc2t3_run</scheme>
35-
<scheme>GFS_suite_interstitial_2_run</scheme>
36-
<scheme>GFS_surface_generic_pre_run</scheme>
37-
<scheme>GFS_PBL_generic_pre_run</scheme>
38-
<scheme>lsm_noah_pre_run</scheme>
30+
<scheme>GFS_suite_interstitial_phys_reset</scheme>
31+
<scheme>get_prs_fv3</scheme>
32+
<scheme>GFS_suite_interstitial_1</scheme>
33+
<scheme>sfc_sice_pre</scheme>
34+
<scheme>dcyc2t3</scheme>
35+
<scheme>GFS_suite_interstitial_2</scheme>
36+
<scheme>GFS_surface_generic_pre</scheme>
37+
<scheme>GFS_PBL_generic_pre</scheme>
38+
<scheme>lsm_noah_pre</scheme>
3939
<!-- DH* TODO - turn into a subsycle loop="2" construct? -->
4040
<!-- Surface iteration loop 1 -->
41-
<scheme>GFS_surface_loop_control_part0_run</scheme>
42-
<scheme>sfc_ex_coef_run</scheme>
43-
<scheme>GFS_surface_loop_control_part1_run</scheme>
44-
<scheme>sfc_nst_pre_run</scheme>
45-
<scheme>sfc_nst_run</scheme>
46-
<scheme>sfc_nst_post_run</scheme>
47-
<scheme>lsm_noah_run</scheme>
48-
<scheme>sfc_sice_run</scheme>
49-
<scheme>GFS_surface_loop_control_part2_run</scheme>
41+
<scheme>GFS_surface_loop_control_part0</scheme>
42+
<scheme>sfc_ex_coef</scheme>
43+
<scheme>GFS_surface_loop_control_part1</scheme>
44+
<scheme>sfc_nst_pre</scheme>
45+
<scheme>sfc_nst</scheme>
46+
<scheme>sfc_nst_post</scheme>
47+
<scheme>lsm_noah</scheme>
48+
<scheme>sfc_sice</scheme>
49+
<scheme>GFS_surface_loop_control_part2</scheme>
5050
<!-- Surface iteration loop 2 -->
51-
<scheme>GFS_surface_loop_control_part0_run</scheme>
52-
<scheme>sfc_ex_coef_run</scheme>
53-
<scheme>GFS_surface_loop_control_part1_run</scheme>
54-
<scheme>sfc_nst_pre_run</scheme>
55-
<scheme>sfc_nst_run</scheme>
56-
<scheme>sfc_nst_post_run</scheme>
57-
<scheme>lsm_noah_run</scheme>
58-
<scheme>sfc_sice_run</scheme>
59-
<scheme>GFS_surface_loop_control_part2_run</scheme>
51+
<scheme>GFS_surface_loop_control_part0</scheme>
52+
<scheme>sfc_ex_coef</scheme>
53+
<scheme>GFS_surface_loop_control_part1</scheme>
54+
<scheme>sfc_nst_pre</scheme>
55+
<scheme>sfc_nst</scheme>
56+
<scheme>sfc_nst_post</scheme>
57+
<scheme>lsm_noah</scheme>
58+
<scheme>sfc_sice</scheme>
59+
<scheme>GFS_surface_loop_control_part2</scheme>
6060
<!-- End of surface iteration loop -->
61-
<scheme>dcyc2t3_post_run</scheme>
62-
<scheme>sfc_diag_run</scheme>
63-
<scheme>GFS_surface_generic_post_run</scheme>
64-
<scheme>edmf_run</scheme>
65-
<scheme>GFS_PBL_generic_post_run</scheme>
66-
<scheme>gwdps_pre_run</scheme>
67-
<scheme>gwdps_run</scheme>
68-
<scheme>gwdps_post_run</scheme>
69-
<scheme>rayleigh_damp_run</scheme>
70-
<scheme>GFS_suite_update_stateout_run</scheme>
71-
<scheme>ozphys_run</scheme>
72-
<scheme>ozphys_post_run</scheme>
73-
<scheme>GFS_DCNV_generic_pre_run</scheme>
74-
<scheme>get_phi_fv3_run</scheme>
75-
<scheme>GFS_suite_interstitial_3_run</scheme>
76-
<scheme>GFS_zhao_carr_pre_run</scheme>
77-
<scheme>sasas_deep_run</scheme>
78-
<scheme>GFS_DCNV_generic_post_run</scheme>
79-
<scheme>gwdc_pre_run</scheme>
80-
<scheme>gwdc_run</scheme>
81-
<scheme>gwdc_post_run</scheme>
82-
<scheme>GFS_SCNV_generic_pre_run</scheme>
83-
<scheme>sasas_shal_run</scheme>
84-
<scheme>sasas_shal_post_run</scheme>
85-
<scheme>GFS_SCNV_generic_post_run</scheme>
86-
<scheme>cnvc90_run</scheme>
87-
<scheme>GFS_MP_generic_pre_run</scheme>
88-
<scheme>zhaocarr_gscond_run</scheme>
89-
<scheme>zhaocarr_precpd_run</scheme>
90-
<scheme>GFS_calpreciptype_run</scheme>
91-
<scheme>GFS_MP_generic_post_run</scheme>
92-
<scheme>sfc_diag_run</scheme>
93-
<scheme>lsm_noah_post_run</scheme>
94-
<scheme>sfc_sice_post_run</scheme>
95-
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
96-
<!-- <scheme>GFS_interstitialtoscreen_run</scheme> -->
61+
<scheme>dcyc2t3_post</scheme>
62+
<scheme>sfc_diag</scheme>
63+
<scheme>GFS_surface_generic_post</scheme>
64+
<scheme>edmf</scheme>
65+
<scheme>GFS_PBL_generic_post</scheme>
66+
<scheme>gwdps_pre</scheme>
67+
<scheme>gwdps</scheme>
68+
<scheme>gwdps_post</scheme>
69+
<scheme>rayleigh_damp</scheme>
70+
<scheme>GFS_suite_update_stateout</scheme>
71+
<scheme>ozphys</scheme>
72+
<scheme>ozphys_post</scheme>
73+
<scheme>GFS_DCNV_generic_pre</scheme>
74+
<scheme>get_phi_fv3</scheme>
75+
<scheme>GFS_suite_interstitial_3</scheme>
76+
<scheme>GFS_zhao_carr_pre</scheme>
77+
<scheme>sasas_deep</scheme>
78+
<scheme>GFS_DCNV_generic_post</scheme>
79+
<scheme>gwdc_pre</scheme>
80+
<scheme>gwdc</scheme>
81+
<scheme>gwdc_post</scheme>
82+
<scheme>GFS_SCNV_generic_pre</scheme>
83+
<scheme>sasas_shal</scheme>
84+
<scheme>sasas_shal_post</scheme>
85+
<scheme>GFS_SCNV_generic_post</scheme>
86+
<scheme>cnvc90</scheme>
87+
<scheme>GFS_MP_generic_pre</scheme>
88+
<scheme>zhaocarr_gscond</scheme>
89+
<scheme>zhaocarr_precpd</scheme>
90+
<scheme>GFS_calpreciptype</scheme>
91+
<scheme>GFS_MP_generic_post</scheme>
92+
<scheme>sfc_diag</scheme>
93+
<scheme>lsm_noah_post</scheme>
94+
<scheme>sfc_sice_post</scheme>
95+
<!-- <scheme>GFS_diagtoscreen</scheme> -->
96+
<!-- <scheme>GFS_interstitialtoscreen</scheme> -->
9797
</subcycle>
9898
</group>
99-
<finalize>GFS_finalize_scm_run</finalize> <!-- need to add this one? -->
99+
<finalize>GFS_finalize_scm</finalize>
100100
</suite>

0 commit comments

Comments
 (0)