From a4a9f0fd5b692101a15f61808a3a7a779b0f27ed Mon Sep 17 00:00:00 2001
From: Tomas Torsvik <43031053+TomasTorsvik@users.noreply.github.com>
Date: Thu, 5 Dec 2024 17:53:01 +0100
Subject: [PATCH] Revert moving hamocc tests to separate directory (#443)

---
 cime_config/testdefs/testlist_blom.xml                        | 4 ++--
 .../testmods_dirs/{ => blom}/hamocc/hamocc1/shell_commands    | 0
 .../testmods_dirs/{ => blom}/hamocc/hamocc1/user_nl_blom      | 0
 .../testmods_dirs/{ => blom}/hamocc/hamocc2/shell_commands    | 0
 .../testmods_dirs/{ => blom}/hamocc/hamocc2/user_nl_blom      | 0
 5 files changed, 2 insertions(+), 2 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 ba446e17..3fa107b8 100644
--- a/cime_config/testdefs/testlist_blom.xml
+++ b/cime_config/testdefs/testlist_blom.xml
@@ -38,7 +38,7 @@
     </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">
+  <test name="SMS_D_Ld1" grid="T62_tn14" compset="NOINYOC" testmods="blom/hamocc/hamocc1">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_hamocc_noresm"/>
     </machines>
@@ -47,7 +47,7 @@
       <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">
+  <test name="SMS_D_Ld1" grid="T62_tn14" compset="NOINYOC" testmods="blom/hamocc/hamocc2">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_hamocc_noresm"/>
     </machines>
diff --git a/cime_config/testdefs/testmods_dirs/hamocc/hamocc1/shell_commands b/cime_config/testdefs/testmods_dirs/blom/hamocc/hamocc1/shell_commands
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/hamocc/hamocc1/shell_commands
rename to cime_config/testdefs/testmods_dirs/blom/hamocc/hamocc1/shell_commands
diff --git a/cime_config/testdefs/testmods_dirs/hamocc/hamocc1/user_nl_blom b/cime_config/testdefs/testmods_dirs/blom/hamocc/hamocc1/user_nl_blom
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/hamocc/hamocc1/user_nl_blom
rename to cime_config/testdefs/testmods_dirs/blom/hamocc/hamocc1/user_nl_blom
diff --git a/cime_config/testdefs/testmods_dirs/hamocc/hamocc2/shell_commands b/cime_config/testdefs/testmods_dirs/blom/hamocc/hamocc2/shell_commands
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/hamocc/hamocc2/shell_commands
rename to cime_config/testdefs/testmods_dirs/blom/hamocc/hamocc2/shell_commands
diff --git a/cime_config/testdefs/testmods_dirs/hamocc/hamocc2/user_nl_blom b/cime_config/testdefs/testmods_dirs/blom/hamocc/hamocc2/user_nl_blom
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/hamocc/hamocc2/user_nl_blom
rename to cime_config/testdefs/testmods_dirs/blom/hamocc/hamocc2/user_nl_blom