From 721a7345d60dab883058f0e5a9b486015773aa32 Mon Sep 17 00:00:00 2001
From: "Chunxi.Zhang-NOAA" <Chunxi.Zhang@noaa.gov>
Date: Mon, 3 Jan 2022 22:24:54 +0000
Subject: [PATCH 1/3] Added a new suite definition file:
 suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf.xml. This SDF is a legacy hwrf SDF
 but only the GFDL surface layer scheme and the Thompson scheme are kept.

---
 ...uite_FV3_HAFS_v0_thompson_tedmf_gfdlsf.xml | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf.xml

diff --git a/ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf.xml b/ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf.xml
new file mode 100644
index 000000000..652c5eabb
--- /dev/null
+++ b/ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<suite name="FV3_HAFS_v0_thompson_tedmf_gfdlsf" version="1">
+  <!-- <init></init> -->
+  <group name="time_vary">
+    <subcycle loop="1">
+      <scheme>GFS_time_vary_pre</scheme>
+      <scheme>GFS_rrtmg_setup</scheme>
+      <scheme>GFS_rad_time_vary</scheme>
+      <scheme>GFS_phys_time_vary</scheme>
+    </subcycle>
+  </group>
+  <group name="radiation">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_rad_reset</scheme>
+      <scheme>GFS_rrtmg_pre</scheme>
+      <scheme>GFS_radiation_surface</scheme>
+      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rrtmg_sw</scheme>
+      <scheme>rrtmg_sw_post</scheme>
+      <scheme>rrtmg_lw_pre</scheme>
+      <scheme>rrtmg_lw</scheme>
+      <scheme>rrtmg_lw_post</scheme>
+      <scheme>GFS_rrtmg_post</scheme>
+    </subcycle>
+  </group>
+  <group name="physics">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_phys_reset</scheme>
+      <scheme>GFS_suite_stateout_reset</scheme>
+      <scheme>get_prs_fv3</scheme>
+      <scheme>GFS_suite_interstitial_1</scheme>
+      <scheme>GFS_surface_generic_pre</scheme>
+      <scheme>GFS_surface_composites_pre</scheme>
+      <scheme>dcyc2t3</scheme>
+      <scheme>GFS_surface_composites_inter</scheme>
+      <scheme>GFS_suite_interstitial_2</scheme>
+    </subcycle>
+    <!-- Surface iteration loop -->
+    <subcycle loop="2">
+      <scheme>gfdl_sfc_layer</scheme>
+      <scheme>GFS_surface_loop_control_part1</scheme>
+      <scheme>sfc_nst_pre</scheme>
+      <scheme>sfc_nst</scheme>
+      <scheme>sfc_nst_post</scheme>
+      <scheme>lsm_noah</scheme>
+      <scheme>sfc_sice</scheme>
+      <scheme>GFS_surface_loop_control_part2</scheme>
+    </subcycle>
+    <!-- End of surface iteration loop -->
+    <subcycle loop="1">
+      <scheme>GFS_surface_composites_post</scheme>
+      <scheme>sfc_diag</scheme>
+      <scheme>sfc_diag_post</scheme>
+      <scheme>GFS_surface_generic_post</scheme>
+      <scheme>GFS_PBL_generic_pre</scheme>
+      <scheme>satmedmfvdifq</scheme>
+      <scheme>GFS_PBL_generic_post</scheme>
+      <scheme>GFS_GWD_generic_pre</scheme>
+      <scheme>cires_ugwp</scheme>
+      <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
+      <scheme>GFS_suite_stateout_update</scheme>
+      <scheme>ozphys_2015</scheme>
+      <scheme>h2ophys</scheme>
+      <scheme>get_phi_fv3</scheme>
+      <scheme>GFS_suite_interstitial_3</scheme>
+      <scheme>GFS_DCNV_generic_pre</scheme>
+      <scheme>samfdeepcnv</scheme>
+      <scheme>GFS_DCNV_generic_post</scheme>
+      <scheme>GFS_SCNV_generic_pre</scheme>
+      <scheme>samfshalcnv</scheme>
+      <scheme>GFS_SCNV_generic_post</scheme>
+      <scheme>GFS_suite_interstitial_4</scheme>
+      <scheme>cnvc90</scheme>
+      <scheme>GFS_MP_generic_pre</scheme>
+      <scheme>mp_thompson_pre</scheme>
+    </subcycle>
+    <subcycle loop="2">
+      <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>phys_tend</scheme>
+    </subcycle>
+  </group>
+  <group name="stochastics">
+    <subcycle loop="1">
+      <scheme>GFS_stochastics</scheme>
+    </subcycle>
+  </group>
+  <!-- <finalize></finalize> -->
+</suite>

From 10b7196b942bb1dd9728ac1130a80e1c9029e990 Mon Sep 17 00:00:00 2001
From: "Chunxi.Zhang-NOAA" <Chunxi.Zhang@noaa.gov>
Date: Tue, 4 Jan 2022 14:51:38 +0000
Subject: [PATCH 2/3] Add a new physcis suite
 suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml

---
 ...3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml

diff --git a/ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml
new file mode 100644
index 000000000..aea6780f4
--- /dev/null
+++ b/ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<suite name="FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst" version="1">
+  <!-- <init></init> -->
+  <group name="time_vary">
+    <subcycle loop="1">
+      <scheme>GFS_time_vary_pre</scheme>
+      <scheme>GFS_rrtmg_setup</scheme>
+      <scheme>GFS_rad_time_vary</scheme>
+      <scheme>GFS_phys_time_vary</scheme>
+    </subcycle>
+  </group>
+  <group name="radiation">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_rad_reset</scheme>
+      <scheme>GFS_rrtmg_pre</scheme>
+      <scheme>GFS_radiation_surface</scheme>
+      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rrtmg_sw</scheme>
+      <scheme>rrtmg_sw_post</scheme>
+      <scheme>rrtmg_lw_pre</scheme>
+      <scheme>rrtmg_lw</scheme>
+      <scheme>rrtmg_lw_post</scheme>
+      <scheme>GFS_rrtmg_post</scheme>
+    </subcycle>
+  </group>
+  <group name="physics">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_phys_reset</scheme>
+      <scheme>GFS_suite_stateout_reset</scheme>
+      <scheme>get_prs_fv3</scheme>
+      <scheme>GFS_suite_interstitial_1</scheme>
+      <scheme>GFS_surface_generic_pre</scheme>
+      <scheme>GFS_surface_composites_pre</scheme>
+      <scheme>dcyc2t3</scheme>
+      <scheme>GFS_surface_composites_inter</scheme>
+      <scheme>GFS_suite_interstitial_2</scheme>
+    </subcycle>
+    <!-- Surface iteration loop -->
+    <subcycle loop="2">
+      <scheme>gfdl_sfc_layer</scheme>
+      <scheme>GFS_surface_loop_control_part1</scheme>
+      <scheme>sfc_ocean</scheme>
+      <scheme>lsm_noah</scheme>
+      <scheme>sfc_sice</scheme>
+      <scheme>GFS_surface_loop_control_part2</scheme>
+    </subcycle>
+    <!-- End of surface iteration loop -->
+    <subcycle loop="1">
+      <scheme>GFS_surface_composites_post</scheme>
+      <scheme>sfc_diag</scheme>
+      <scheme>sfc_diag_post</scheme>
+      <scheme>GFS_surface_generic_post</scheme>
+      <scheme>GFS_PBL_generic_pre</scheme>
+      <scheme>satmedmfvdifq</scheme>
+      <scheme>GFS_PBL_generic_post</scheme>
+      <scheme>GFS_GWD_generic_pre</scheme>
+      <scheme>cires_ugwp</scheme>
+      <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
+      <scheme>GFS_suite_stateout_update</scheme>
+      <scheme>ozphys_2015</scheme>
+      <scheme>h2ophys</scheme>
+      <scheme>get_phi_fv3</scheme>
+      <scheme>GFS_suite_interstitial_3</scheme>
+      <scheme>GFS_DCNV_generic_pre</scheme>
+      <scheme>samfdeepcnv</scheme>
+      <scheme>GFS_DCNV_generic_post</scheme>
+      <scheme>GFS_SCNV_generic_pre</scheme>
+      <scheme>samfshalcnv</scheme>
+      <scheme>GFS_SCNV_generic_post</scheme>
+      <scheme>GFS_suite_interstitial_4</scheme>
+      <scheme>cnvc90</scheme>
+      <scheme>GFS_MP_generic_pre</scheme>
+      <scheme>mp_thompson_pre</scheme>
+    </subcycle>
+    <subcycle loop="2">
+      <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>phys_tend</scheme>
+    </subcycle>
+  </group>
+  <group name="stochastics">
+    <subcycle loop="1">
+      <scheme>GFS_stochastics</scheme>
+    </subcycle>
+  </group>
+  <!-- <finalize></finalize> -->
+</suite>

From af5499222f8a64cf8747f5704a44832fff029a77 Mon Sep 17 00:00:00 2001
From: "Chunxi.Zhang-NOAA" <Chunxi.Zhang@noaa.gov>
Date: Tue, 18 Jan 2022 21:17:38 +0000
Subject: [PATCH 3/3] Deleted
 suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml since this suite has
 issues to compile

---
 ...3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml | 93 -------------------
 1 file changed, 93 deletions(-)
 delete mode 100644 ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml

diff --git a/ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml
deleted file mode 100644
index aea6780f4..000000000
--- a/ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_HAFS_v0_thompson_tedmf_gfdlsf_nonsst" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>gfdl_sfc_layer</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_ocean</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>satmedmfvdifq</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>mp_thompson_pre</scheme>
-    </subcycle>
-    <subcycle loop="2">
-      <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>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>