From 4ba49313aaf4a3cd846c3b4d55bd4e3957ffedf2 Mon Sep 17 00:00:00 2001
From: Tomas Torsvik <43031053+TomasTorsvik@users.noreply.github.com>
Date: Thu, 22 Aug 2024 12:21:02 +0200
Subject: [PATCH] release-1.6 : Restructure testdefs for blom and hamocc (#386)

---
 cime_config/testdefs/testlist_blom.xml        | 51 ++++++++++++++++---
 .../{blom => hamocc}/hamocc1/shell_commands   |  0
 .../{blom => hamocc}/hamocc1/user_nl_blom     |  0
 .../{blom => hamocc}/hamocc2/shell_commands   |  0
 .../{blom => hamocc}/hamocc2/user_nl_blom     |  0
 5 files changed, 45 insertions(+), 6 deletions(-)
 rename cime_config/testdefs/testmods_dirs/{blom => hamocc}/hamocc1/shell_commands (100%)
 rename cime_config/testdefs/testmods_dirs/{blom => hamocc}/hamocc1/user_nl_blom (100%)
 rename cime_config/testdefs/testmods_dirs/{blom => hamocc}/hamocc2/shell_commands (100%)
 rename cime_config/testdefs/testmods_dirs/{blom => hamocc}/hamocc2/user_nl_blom (100%)

diff --git a/cime_config/testdefs/testlist_blom.xml b/cime_config/testdefs/testlist_blom.xml
index e1426bba..8895fcf2 100644
--- a/cime_config/testdefs/testlist_blom.xml
+++ b/cime_config/testdefs/testlist_blom.xml
@@ -1,38 +1,77 @@
 <?xml version="1.0"?>
 <testlist version="2.0">
+  <!-- aux_blom_noresm : Declarations for BLOM/iHAMOCC tests -->
   <test name="SMS_D_Ld1" grid="T62_tn14" compset="NOINYOC">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_blom_noresm"/>
     </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">test debug mode with isopycnic layers, hamocc and core forcing</option>
+    </options>
   </test>
   <test name="ERS_Ld3" grid="T62_tn14" compset="NOINYOC">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_blom_noresm"/>
     </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">test restart with isopycnic layers, hamocc and core forcing</option>
+    </options>
   </test>
-  <test name="ERS_Ld3" grid="T62_tn14" compset="NOINYOC" testmods="blom/hamocc1">
-    <machines>
-      <machine name="betzy" compiler="intel" category="aux_blom_noresm"/>
-    </machines>
-  </test>
-  <test name="ERS_Ld3" grid="T62_tn14" compset="NOINYOC" testmods="blom/hamocc2">
+  <test name="ERR_Ld3" grid="TL319_tn14" compset="NOIIAJRAOC">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_blom_noresm"/>
     </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">test restart/resubmit with isopycnic coordinates, hamocc and JRA forcing</option>
+    </options>
   </test>
   <test name="ERP_Ld3" grid="T62_tn14" compset="NOINY">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_blom_noresm"/>
     </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">test bfb with changing processor count and openmp on</option>
+    </options>
   </test>
   <test name="ERS_Ld3" grid="T62_tn14_wtn14nw" compset="NOINY_WW3">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_blom_noresm"/>
     </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">test restart with WW3</option>
+    </options>
   </test>
   <test name="ERS_Ld3" grid="T62_tn14_wtn14nw" compset="NOINY_WW3" testmods="blom/wavice">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_blom_noresm"/>
     </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">test restart with WW3 + CICE</option>
+    </options>
+  </test>
+  <!-- Declarations for tests with different iHAMOCC settings: aux_hamocc_noresm -->
+  <test name="SMS_D_Ld1" grid="T62_tn14" compset="NOINYOC" testmods="hamocc/hamocc1">
+    <machines>
+      <machine name="betzy" compiler="intel" category="aux_hamocc_noresm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">test debug mode with CISO=TRUE</option>
+    </options>
+  </test>
+  <test name="SMS_D_Ld1" grid="T62_tn14" compset="NOINYOC" testmods="hamocc/hamocc2">
+    <machines>
+      <machine name="betzy" compiler="intel" category="aux_hamocc_noresm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">test debug mode with CISO=TRUE; SEDBYPASS=TRUE</option>
+    </options>
   </test>
 </testlist>
diff --git a/cime_config/testdefs/testmods_dirs/blom/hamocc1/shell_commands b/cime_config/testdefs/testmods_dirs/hamocc/hamocc1/shell_commands
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/blom/hamocc1/shell_commands
rename to cime_config/testdefs/testmods_dirs/hamocc/hamocc1/shell_commands
diff --git a/cime_config/testdefs/testmods_dirs/blom/hamocc1/user_nl_blom b/cime_config/testdefs/testmods_dirs/hamocc/hamocc1/user_nl_blom
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/blom/hamocc1/user_nl_blom
rename to cime_config/testdefs/testmods_dirs/hamocc/hamocc1/user_nl_blom
diff --git a/cime_config/testdefs/testmods_dirs/blom/hamocc2/shell_commands b/cime_config/testdefs/testmods_dirs/hamocc/hamocc2/shell_commands
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/blom/hamocc2/shell_commands
rename to cime_config/testdefs/testmods_dirs/hamocc/hamocc2/shell_commands
diff --git a/cime_config/testdefs/testmods_dirs/blom/hamocc2/user_nl_blom b/cime_config/testdefs/testmods_dirs/hamocc/hamocc2/user_nl_blom
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/blom/hamocc2/user_nl_blom
rename to cime_config/testdefs/testmods_dirs/hamocc/hamocc2/user_nl_blom