From 232c54aec4b10fd0a02df6fe6924addabaef5646 Mon Sep 17 00:00:00 2001
From: "G. Dylan Dickerson" <gdicker@ucar.edu>
Date: Fri, 31 May 2024 16:36:18 -0600
Subject: [PATCH 1/5] Reorder ew-rel tests

---
 cime_config/testlist_earthworks.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml
index 8517a10..5141849 100644
--- a/cime_config/testlist_earthworks.xml
+++ b/cime_config/testlist_earthworks.xml
@@ -70,25 +70,25 @@
       <option name="wallclock"> 00:15:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa060_oQU060" compset="FullyCoupledEW">
+  <test name="ERP_Vnuopc" grid="mpasa120z58_oQU120" compset="FullyCoupledEW">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
     </machines>
     <options>
-      <option name="wallclock"> 00:30:00 </option>
+      <option name="wallclock"> 01:00:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa030_oQU030" compset="FullyCoupledEW">
+  <test name="ERP_Vnuopc" grid="mpasa060_oQU060" compset="FullyCoupledEW">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
     </machines>
     <options>
-      <option name="wallclock"> 01:00:00 </option>
+      <option name="wallclock"> 00:30:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa015z58_oQU015" compset="FullyCoupledEW">
+  <test name="ERP_Vnuopc" grid="mpasa030_oQU030" compset="FullyCoupledEW">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
@@ -97,7 +97,7 @@
       <option name="wallclock"> 01:00:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa120z58_oQU120" compset="FullyCoupledEW">
+  <test name="ERP_Vnuopc" grid="mpasa015z58_oQU015" compset="FullyCoupledEW">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>

From b0f80aed7d62a476db71b7032686233018d90a36 Mon Sep 17 00:00:00 2001
From: "G. Dylan Dickerson" <gdicker@ucar.edu>
Date: Fri, 31 May 2024 16:39:53 -0600
Subject: [PATCH 2/5] Add CHAOS2000dev and F2000climoEW to ew-pr tests

---
 cime_config/testlist_earthworks.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml
index 5141849..39f2b26 100644
--- a/cime_config/testlist_earthworks.xml
+++ b/cime_config/testlist_earthworks.xml
@@ -28,7 +28,7 @@
       <option name="wallclock"> 00:20:00 </option>
     </options>
   </test>
-  <test name="SMS_P128_Vnuopc" grid="mpasa120_mpasa120" compset="F2000climo" >
+  <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="F2000climoEW" >
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
     </machines>
@@ -37,6 +37,15 @@
     </options>
   </test>
   <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="FullyCoupledEW">
+    <machines>
+      <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 01:00:00 </option>
+      <option name="comment">EarthWorks model with active mpasa, mpaso, mpassi</option>
+    </options>
+  </test>
+  <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
       <machine name="derecho" compiler="intel" category="ew-pr"/>
@@ -44,7 +53,7 @@
     </machines>
     <options>
       <option name="wallclock"> 01:00:00 </option>
-      <option name="comment">EarthWorks model with active mpasa, mpaso, mpassi</option>
+      <option name="comment">EarthWorks model with active mpasa, mpaso, mpassi using cam_dev physics</option>
     </options>
   </test>
 

From ab44a8505cd4f5134744b65f4ce45ed9db90bf96 Mon Sep 17 00:00:00 2001
From: "G. Dylan Dickerson" <gdicker@ucar.edu>
Date: Fri, 31 May 2024 16:43:46 -0600
Subject: [PATCH 3/5] Set ew-rel to CHAOS2000dev exact restart tests

Add task counts for each ew-rel test and increase wallclock requested to
ensure tests complete.
---
 cime_config/testlist_earthworks.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml
index 39f2b26..f020d50 100644
--- a/cime_config/testlist_earthworks.xml
+++ b/cime_config/testlist_earthworks.xml
@@ -70,7 +70,7 @@
   </test>
 
   <!-- ew-rel Tests to run while creating a release -->
-  <test name="ERP_Vnuopc" grid="mpasa120_oQU120" compset="FullyCoupledEW">
+  <test name="ERS_P128_Vnuopc" grid="mpasa120_oQU120" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
@@ -79,40 +79,40 @@
       <option name="wallclock"> 00:15:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa120z58_oQU120" compset="FullyCoupledEW">
+  <test name="ERS_P128_Vnuopc" grid="mpasa120z58_oQU120" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
     </machines>
     <options>
-      <option name="wallclock"> 01:00:00 </option>
+      <option name="wallclock"> 12:00:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa060_oQU060" compset="FullyCoupledEW">
+  <test name="ERS_P128_Vnuopc" grid="mpasa060_oQU060" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
     </machines>
     <options>
-      <option name="wallclock"> 00:30:00 </option>
+      <option name="wallclock"> 12:00:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa030_oQU030" compset="FullyCoupledEW">
+  <test name="ERS_P5120_Vnuopc" grid="mpasa030_oQU030" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
     </machines>
     <options>
-      <option name="wallclock"> 01:00:00 </option>
+      <option name="wallclock"> 12:00:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa015z58_oQU015" compset="FullyCoupledEW">
+  <test name="ERS_P10240_Vnuopc" grid="mpasa015z58_oQU015" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
     </machines>
     <options>
-      <option name="wallclock"> 01:00:00 </option>
+      <option name="wallclock"> 12:00:00 </option>
     </options>
   </test>
 </testlist>

From d61ee1c630eb6645a05a66f5728f1549e00bb632 Mon Sep 17 00:00:00 2001
From: "G. Dylan Dickerson" <gdicker@ucar.edu>
Date: Mon, 3 Jun 2024 08:28:06 -0600
Subject: [PATCH 4/5] Bring in CAM fixes to EW-specific files

See EWOrg/CAM PR #20 for more info
---
 Externals.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Externals.cfg b/Externals.cfg
index 53f68a9..f34da03 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -6,7 +6,8 @@ local_path = ccs_config
 required = True
 
 [cam]
-tag = cam-ew2.1.005
+branch = update_v8mpasfiles_eworg
+# tag = cam-ew2.1.006
 protocol = git
 repo_url = https://github.com/EarthWorksOrg/CAM
 local_path = components/cam

From 99c4a8c6c0a7962e29168641aa80d546a491b3f5 Mon Sep 17 00:00:00 2001
From: "G. Dylan Dickerson" <gdicker@ucar.edu>
Date: Mon, 3 Jun 2024 10:43:13 -0600
Subject: [PATCH 5/5] Switch CAM to tag for merged EWOrg/CAM #20

---
 Externals.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index f34da03..7a86877 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -6,8 +6,7 @@ local_path = ccs_config
 required = True
 
 [cam]
-branch = update_v8mpasfiles_eworg
-# tag = cam-ew2.1.006
+tag = cam-ew2.1.006
 protocol = git
 repo_url = https://github.com/EarthWorksOrg/CAM
 local_path = components/cam