From 67c288c631156f3b72660657b65267e681fefc96 Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Thu, 31 Oct 2024 17:00:45 -0600
Subject: [PATCH 1/4] Update testlist_rtm

---
 cime_config/testdefs/testlist_rtm.xml | 34 ++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/cime_config/testdefs/testlist_rtm.xml b/cime_config/testdefs/testlist_rtm.xml
index 6c668de..3784d34 100644
--- a/cime_config/testdefs/testlist_rtm.xml
+++ b/cime_config/testdefs/testlist_rtm.xml
@@ -1,7 +1,25 @@
 <?xml version="1.0"?>
 <testlist version="2.0">
 
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
+  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm45Sp" testmods="rtm/default">
+    <machines>
+      <machine name="derecho" compiler="intel" category="rtm"></machine>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Restart test with DEBUG on</option>
+    </options>
+  </test>
+  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50SpRtmFl" testmods="rtm/default">
+    <machines>
+      <machine name="derecho" compiler="intel" category="rtm"></machine>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Restart test with DEBUG on</option>
+    </options>
+  </test>
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -11,7 +29,7 @@
       <option name="comment"  >Restart test without DEBUG on all machines/compilers (except nag because of a CTSM issue)</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
+  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -21,7 +39,7 @@
       <option name="comment"  >Run with DEBUG compiler option all machine/compilers</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmColdStart">
+  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmColdStart">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -31,7 +49,7 @@
       <option name="comment"  >Run a Cold-Start with main machine all compilers</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnIceOff">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmOnIceOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
          <options>
@@ -44,7 +62,7 @@
       <option name="comment"  >Run with ice off</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOn">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -57,7 +75,7 @@
       <option name="comment"  >Run with flooding on and effective velocity on</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOn">
+  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -70,7 +88,7 @@
       <option name="comment"  >Run with flooding on and effective velocity on, DEBUG on, all machines/compilers</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOff">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -83,7 +101,7 @@
       <option name="comment"  >Run with flooding on and effective velocity off</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOff">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>

From 5bf281265cab670231b98e84daec19e6d7c2e3be Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Wed, 6 Nov 2024 15:07:35 -0700
Subject: [PATCH 2/4] Change compsets in testlist_rtm to ones that exist

---
 cime_config/testdefs/testlist_rtm.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cime_config/testdefs/testlist_rtm.xml b/cime_config/testdefs/testlist_rtm.xml
index 3784d34..285dbec 100644
--- a/cime_config/testdefs/testlist_rtm.xml
+++ b/cime_config/testdefs/testlist_rtm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <testlist version="2.0">
 
-  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm45Sp" testmods="rtm/default">
+  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm45Bgc" testmods="rtm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
     </machines>
@@ -19,7 +19,7 @@
       <option name="comment"  >Restart test with DEBUG on</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/default">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -29,7 +29,7 @@
       <option name="comment"  >Restart test without DEBUG on all machines/compilers (except nag because of a CTSM issue)</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/default">
+  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -39,7 +39,7 @@
       <option name="comment"  >Run with DEBUG compiler option all machine/compilers</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmColdStart">
+  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmColdStart">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -49,7 +49,7 @@
       <option name="comment"  >Run a Cold-Start with main machine all compilers</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmOnIceOff">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmOnIceOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
          <options>
@@ -62,7 +62,7 @@
       <option name="comment"  >Run with ice off</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -75,7 +75,7 @@
       <option name="comment"  >Run with flooding on and effective velocity on</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
+  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -88,7 +88,7 @@
       <option name="comment"  >Run with flooding on and effective velocity on, DEBUG on, all machines/compilers</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOff">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmOnFloodOnEffvelOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -101,7 +101,7 @@
       <option name="comment"  >Run with flooding on and effective velocity off</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60SpNoAnthro" testmods="rtm/rtmOff">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>

From 185d319fffc218d4cb3f5ab5bc55fedd139b6be5 Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Wed, 6 Nov 2024 15:18:13 -0700
Subject: [PATCH 3/4] Change compsets in testlist_rtm to other ones that also
 exist

---
 cime_config/testdefs/testlist_rtm.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cime_config/testdefs/testlist_rtm.xml b/cime_config/testdefs/testlist_rtm.xml
index 285dbec..653d006 100644
--- a/cime_config/testdefs/testlist_rtm.xml
+++ b/cime_config/testdefs/testlist_rtm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <testlist version="2.0">
 
-  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm45Bgc" testmods="rtm/default">
+  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm45Sp" testmods="rtm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
     </machines>
@@ -19,7 +19,7 @@
       <option name="comment"  >Restart test with DEBUG on</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/default">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -29,7 +29,7 @@
       <option name="comment"  >Restart test without DEBUG on all machines/compilers (except nag because of a CTSM issue)</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/default">
+  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -39,7 +39,7 @@
       <option name="comment"  >Run with DEBUG compiler option all machine/compilers</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmColdStart">
+  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmColdStart">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -49,7 +49,7 @@
       <option name="comment"  >Run a Cold-Start with main machine all compilers</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmOnIceOff">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnIceOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
          <options>
@@ -62,7 +62,7 @@
       <option name="comment"  >Run with ice off</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmOnFloodOnEffvelOn">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -75,7 +75,7 @@
       <option name="comment"  >Run with flooding on and effective velocity on</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmOnFloodOnEffvelOn">
+  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -88,7 +88,7 @@
       <option name="comment"  >Run with flooding on and effective velocity on, DEBUG on, all machines/compilers</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmOnFloodOnEffvelOff">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -101,7 +101,7 @@
       <option name="comment"  >Run with flooding on and effective velocity off</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm60Sp" testmods="rtm/rtmOff">
+  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>

From 3c42c122d1b5bd1fdb667f3a45ba33b1e6134616 Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Fri, 8 Nov 2024 14:02:51 -0700
Subject: [PATCH 4/4] Change NoAnthro tests from f10 to f09

---
 cime_config/testdefs/testlist_rtm.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cime_config/testdefs/testlist_rtm.xml b/cime_config/testdefs/testlist_rtm.xml
index 653d006..a462738 100644
--- a/cime_config/testdefs/testlist_rtm.xml
+++ b/cime_config/testdefs/testlist_rtm.xml
@@ -19,7 +19,7 @@
       <option name="comment"  >Restart test with DEBUG on</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/default">
+  <test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -29,7 +29,7 @@
       <option name="comment"  >Restart test without DEBUG on all machines/compilers (except nag because of a CTSM issue)</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/default">
+  <test name="SMS_D_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -39,7 +39,7 @@
       <option name="comment"  >Run with DEBUG compiler option all machine/compilers</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmColdStart">
+  <test name="SMS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmColdStart">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm"></machine>
       <machine name="derecho" compiler="gnu" category="rtm"></machine>
@@ -49,7 +49,7 @@
       <option name="comment"  >Run a Cold-Start with main machine all compilers</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnIceOff">
+  <test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnIceOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
          <options>
@@ -62,7 +62,7 @@
       <option name="comment"  >Run with ice off</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
+  <test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -75,7 +75,7 @@
       <option name="comment"  >Run with flooding on and effective velocity on</option>
     </options>
   </test>
-  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
+  <test name="ERS_D_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -88,7 +88,7 @@
       <option name="comment"  >Run with flooding on and effective velocity on, DEBUG on, all machines/compilers</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOff">
+  <test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>
@@ -101,7 +101,7 @@
       <option name="comment"  >Run with flooding on and effective velocity off</option>
     </options>
   </test>
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOff">
+  <test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOff">
     <machines>
       <machine name="derecho" compiler="intel" category="rtm">
         <options>