diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8.xml b/ccpp/suites/suite_SCM_GFS_v17_p8.xml
index 17eb9993b..6f74a1456 100644
--- a/ccpp/suites/suite_SCM_GFS_v17_p8.xml
+++ b/ccpp/suites/suite_SCM_GFS_v17_p8.xml
@@ -73,16 +73,16 @@
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson_post</scheme>
- <scheme>GFS_MP_generic_post</scheme>
- <scheme>maximum_hourly_diagnostics</scheme>
- <scheme>GFS_physics_post</scheme>
- </subcycle>
- </group>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson</scheme>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson_post</scheme>
+ <scheme>GFS_MP_generic_post</scheme>
+ <scheme>maximum_hourly_diagnostics</scheme>
+ <scheme>GFS_physics_post</scheme>
+ </subcycle>
+ </group>
<!-- <finalize></finalize> -->
</suite>
diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml
index 5105ec520..7ce8690fe 100644
--- a/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml
+++ b/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml
@@ -73,17 +73,17 @@
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson_post</scheme>
- <scheme>GFS_MP_generic_post</scheme>
- <scheme>cu_c3_driver_post</scheme>
- <scheme>maximum_hourly_diagnostics</scheme>
- <scheme>GFS_physics_post</scheme>
- </subcycle>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson</scheme>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson_post</scheme>
+ <scheme>GFS_MP_generic_post</scheme>
+ <scheme>cu_c3_driver_post</scheme>
+ <scheme>maximum_hourly_diagnostics</scheme>
+ <scheme>GFS_physics_post</scheme>
+ </subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
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 4a759285c..d0746aff7 100644
--- a/ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.xml
+++ b/ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.xml
@@ -54,17 +54,17 @@
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson_post</scheme>
- <scheme>GFS_MP_generic_post</scheme>
- <scheme>cu_c3_driver_post</scheme>
- <scheme>maximum_hourly_diagnostics</scheme>
- <scheme>GFS_physics_post</scheme>
- </subcycle>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson</scheme>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson_post</scheme>
+ <scheme>GFS_MP_generic_post</scheme>
+ <scheme>cu_c3_driver_post</scheme>
+ <scheme>maximum_hourly_diagnostics</scheme>
+ <scheme>GFS_physics_post</scheme>
+ </subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml
index 35c3941a8..98cc11e50 100644
--- a/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml
+++ b/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml
@@ -54,16 +54,16 @@
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson_post</scheme>
- <scheme>GFS_MP_generic_post</scheme>
- <scheme>maximum_hourly_diagnostics</scheme>
- <scheme>GFS_physics_post</scheme>
- </subcycle>
- </group>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson</scheme>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson_post</scheme>
+ <scheme>GFS_MP_generic_post</scheme>
+ <scheme>maximum_hourly_diagnostics</scheme>
+ <scheme>GFS_physics_post</scheme>
+ </subcycle>
+ </group>
<!-- <finalize></finalize> -->
</suite>
diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1.xml
index 865fe47f6..2899e1a3a 100644
--- a/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1.xml
+++ b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1.xml
@@ -73,16 +73,16 @@
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson_post</scheme>
- <scheme>GFS_MP_generic_post</scheme>
- <scheme>maximum_hourly_diagnostics</scheme>
- <scheme>GFS_physics_post</scheme>
- </subcycle>
- </group>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson</scheme>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson_post</scheme>
+ <scheme>GFS_MP_generic_post</scheme>
+ <scheme>maximum_hourly_diagnostics</scheme>
+ <scheme>GFS_physics_post</scheme>
+ </subcycle>
+ </group>
<!-- <finalize></finalize> -->
</suite>
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 cd62b628e..587ab33df 100644
--- a/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_ps.xml
+++ b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_ps.xml
@@ -54,16 +54,16 @@
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson</scheme>
- </subcycle>
- <subcycle loop="1">
- <scheme>mp_thompson_post</scheme>
- <scheme>GFS_MP_generic_post</scheme>
- <scheme>maximum_hourly_diagnostics</scheme>
- <scheme>GFS_physics_post</scheme>
- </subcycle>
- </group>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson</scheme>
+ </subcycle>
+ <subcycle loop="1">
+ <scheme>mp_thompson_post</scheme>
+ <scheme>GFS_MP_generic_post</scheme>
+ <scheme>maximum_hourly_diagnostics</scheme>
+ <scheme>GFS_physics_post</scheme>
+ </subcycle>
+ </group>
<!-- <finalize></finalize> -->
</suite>