From aa3cb3f470fefc0e1dae7b413815947ba9e6862c Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Fri, 8 May 2026 15:58:04 -0600
Subject: [PATCH 1/4] Add back test that was accidentally removed in #402

---
 datm/cime_config/testdefs/testlist_datm.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/datm/cime_config/testdefs/testlist_datm.xml b/datm/cime_config/testdefs/testlist_datm.xml
index f8c42852..361c38b7 100644
--- a/datm/cime_config/testdefs/testlist_datm.xml
+++ b/datm/cime_config/testdefs/testlist_datm.xml
@@ -141,6 +141,7 @@
   <test compset="1850_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cdeps"/>
+      <machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>

From 0bdb38e9d0f76ff02e8118070b8298bc7b0e79e4 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Fri, 8 May 2026 18:04:02 -0600
Subject: [PATCH 2/4] Point to the CPLHIST data under CESM inputdata rather
 than scratch

---
 .../testdefs/testmods_dirs/datm/cplhist/shell_commands          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands b/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands
index 8906abc7..62c8d137 100644
--- a/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands
+++ b/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands
@@ -1,4 +1,4 @@
-./xmlchange DATM_CPLHIST_DIR="/glade/derecho/scratch/hannay/archive/b.e30_alpha08o.B1850C_MTso.ne30_t232_wgx3.330/cpl/hist/"
+./xmlchange DATM_CPLHIST_DIR="$DIN_LOC_ROOT/cplhist/cesm3_0/$DATM_CPLHIST_CASE"
 ./xmlchange DATM_CPLHIST_CASE="b.e30_alpha08o.B1850C_MTso.ne30_t232_wgx3.330"
 ./xmlchange DATM_YR_START="101"
 ./xmlchange DATM_YR_END="101"

From f0fa572a9828857899a7f1cf269ae0169116da00 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Fri, 8 May 2026 18:57:32 -0600
Subject: [PATCH 3/4] Add missing final atm subdirectory that is needed to
 complete the CPLHIST directory

---
 .../testdefs/testmods_dirs/datm/cplhist/shell_commands          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands b/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands
index 62c8d137..48ad4db2 100644
--- a/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands
+++ b/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands
@@ -1,4 +1,4 @@
-./xmlchange DATM_CPLHIST_DIR="$DIN_LOC_ROOT/cplhist/cesm3_0/$DATM_CPLHIST_CASE"
+./xmlchange DATM_CPLHIST_DIR="$DIN_LOC_ROOT/cplhist/cesm3_0/$DATM_CPLHIST_CASE/atm"
 ./xmlchange DATM_CPLHIST_CASE="b.e30_alpha08o.B1850C_MTso.ne30_t232_wgx3.330"
 ./xmlchange DATM_YR_START="101"
 ./xmlchange DATM_YR_END="101"

From 6952408df7ce5c692a80b8560141e1d945be1bdb Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 9 May 2026 14:29:02 -0600
Subject: [PATCH 4/4] Needs single quotes for the XML variables

---
 .../testdefs/testmods_dirs/datm/cplhist/shell_commands          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands b/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands
index 48ad4db2..847d5514 100644
--- a/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands
+++ b/datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands
@@ -1,4 +1,4 @@
-./xmlchange DATM_CPLHIST_DIR="$DIN_LOC_ROOT/cplhist/cesm3_0/$DATM_CPLHIST_CASE/atm"
+./xmlchange DATM_CPLHIST_DIR='$DIN_LOC_ROOT/cplhist/cesm3_0/$DATM_CPLHIST_CASE/atm'
 ./xmlchange DATM_CPLHIST_CASE="b.e30_alpha08o.B1850C_MTso.ne30_t232_wgx3.330"
 ./xmlchange DATM_YR_START="101"
 ./xmlchange DATM_YR_END="101"