From ed9d813eba6be739494d430e86e5ea785f8ce567 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr." <kavulich@ucar.edu>
Date: Wed, 22 May 2024 13:36:15 -0600
Subject: [PATCH] Forgot to fully change barn_owl (HAFS_v0_hwrf) to macaw,
 missed one in alias file, correct some rebase mistakes

---
 ccpp/suites/alias.json                        | 1 +
 ccpp/suites/{barn_owl.xml => macaw.xml}       | 4 ++--
 ccpp/suites/{barn_owl_ps.xml => macaw_ps.xml} | 4 ++--
 scm/src/suite_info.py                         | 4 ++--
 scm/src/supported_suites.py                   | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)
 rename ccpp/suites/{barn_owl.xml => macaw.xml} (87%)
 rename ccpp/suites/{barn_owl_ps.xml => macaw_ps.xml} (85%)

diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json
index bc3b1bab9..f3f47fa48 100644
--- a/ccpp/suites/alias.json
+++ b/ccpp/suites/alias.json
@@ -1,5 +1,6 @@
 {
     "SCM_GFS_v17_HR3.xml": "magpie.xml",
+    "SCM_GFS_v17_HR3_ps.xml": "magpie_ps.xml",
     "SCM_GFS_v16.xml": "raven.xml",
     "SCM_GFS_v16_ps.xml": "raven_ps.xml",
     "HAFS_v0_hwrf.xml": "macaw.xml",
diff --git a/ccpp/suites/barn_owl.xml b/ccpp/suites/macaw.xml
similarity index 87%
rename from ccpp/suites/barn_owl.xml
rename to ccpp/suites/macaw.xml
index 81a85e5ff..cc471c758 100644
--- a/ccpp/suites/barn_owl.xml
+++ b/ccpp/suites/macaw.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "barn_owl" (formerly known as HAFS_v0_hwrf) was used for pre-implementation experiments for the first prototypes of The Hurricane Analysis and Forecast System (HAFS). It was meant to emulate the physics of the Hurricane Weather Research and Forecasting model (HWRF), though it had some differences from the operational implementation (which was not CCPP-based).
+Suite "macaw" (formerly known as HAFS_v0_hwrf) was used for pre-implementation experiments for the first prototypes of The Hurricane Analysis and Forecast System (HAFS). It was meant to emulate the physics of the Hurricane Weather Research and Forecasting model (HWRF), though it had some differences from the operational implementation (which was not CCPP-based).
 -->
-<suite name="barn_owl" version="1">
+<suite name="macaw" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/barn_owl_ps.xml b/ccpp/suites/macaw_ps.xml
similarity index 85%
rename from ccpp/suites/barn_owl_ps.xml
rename to ccpp/suites/macaw_ps.xml
index 9a8a2cbf0..8ebbc97cb 100644
--- a/ccpp/suites/barn_owl_ps.xml
+++ b/ccpp/suites/macaw_ps.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "barn_owl" (formerly known as HAFS_v0_hwrf) was used for pre-implementation experiments for the first prototypes of The Hurricane Analysis and Forecast System (HAFS). It was meant to emulate the physics of the Hurricane Weather Research and Forecasting model (HWRF), though it had some differences from the operational implementation (which was not CCPP-based).
+Suite "macaw" (formerly known as HAFS_v0_hwrf) was used for pre-implementation experiments for the first prototypes of The Hurricane Analysis and Forecast System (HAFS). It was meant to emulate the physics of the Hurricane Weather Research and Forecasting model (HWRF), though it had some differences from the operational implementation (which was not CCPP-based).
 
 This is an SCM-specific "prescribed surface" suite file, specifically for experiments over land points which require prescribed surface fluxes. See https://ccpp-scm.readthedocs.io/en/latest/chap_intro.html#limitations for more information.
 -->
-<suite name="barn_owl_ps" version="1">
+<suite name="macaw_ps" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/scm/src/suite_info.py b/scm/src/suite_info.py
index f3309c539..6e1bc633a 100755
--- a/scm/src/suite_info.py
+++ b/scm/src/suite_info.py
@@ -44,8 +44,8 @@ def timestep(self, value):
 suite_list = []
 suite_list.append(suite('raven',        'tracers_GFS_v16.txt',                  'input_GFS_v16.nml',                 600.0, 1800.0, True ))
 suite_list.append(suite('bluebird',     'tracers_GFS_v17_p8.txt',               'input_GFS_v17_p8.nml',              600.0, 600.0,  True ))
-suite_list.append(suite('magpie',       'tracers_GFS_v17_p8.txt',               'input_GFS_v17_HR3.nml',             600.0, 600.0,  True ))
-suite_list.append(suite('robin',        'tracers_GFS_v17_p8.txt',               'input_GFS_v17_HR3_RRTMGP.nml',      600.0, 600.0,  True ))
+suite_list.append(suite('magpie',       'tracers_GFS_v17_HR3.txt',              'input_GFS_v17_HR3.nml',             600.0, 600.0,  True ))
+suite_list.append(suite('robin',        'tracers_GFS_v17_HR3.txt',              'input_GFS_v17_HR3_RRTMGP.nml',      600.0, 600.0,  True ))
 suite_list.append(suite('albatross',    'tracers_RAP.txt',                      'input_RAP.nml',                     600.0, 600.0 , True ))
 suite_list.append(suite('warbler',      'tracers_RRFS_v1.txt',                  'input_RRFS_v1.nml',                 600.0, 600.0 , True ))
 suite_list.append(suite('pigeon',       'tracers_RRFS_v1beta.txt',              'input_RRFS_v1beta.nml',             600.0, 600.0 , True ))
diff --git a/scm/src/supported_suites.py b/scm/src/supported_suites.py
index 1d7b72039..5f9816a5f 100644
--- a/scm/src/supported_suites.py
+++ b/scm/src/supported_suites.py
@@ -1 +1 @@
-suites = ["raven","magpie","bluebird","bald_eagle","albatross","pigeon","hummingbird"]
+suites = ["raven","magpie","robin","warbler","hummingbird"]