From 203958ef2b28c30aa1ef7da32d130e29c3cedf1c Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Fri, 3 Apr 2026 15:53:34 -0600
Subject: [PATCH 1/4] Remove the cplhist testmod since CDEPS will now point to
 the case to use for CPLHIST

---
 .../testdefs/testmods_dirs/clm/cplhist/include_user_mods  | 1 -
 .../testdefs/testmods_dirs/clm/cplhist/shell_commands     | 8 --------
 2 files changed, 9 deletions(-)
 delete mode 100644 cime_config/testdefs/testmods_dirs/clm/cplhist/include_user_mods
 delete mode 100755 cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands

diff --git a/cime_config/testdefs/testmods_dirs/clm/cplhist/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/cplhist/include_user_mods
deleted file mode 100644
index fe0e18cf88..0000000000
--- a/cime_config/testdefs/testmods_dirs/clm/cplhist/include_user_mods
+++ /dev/null
@@ -1 +0,0 @@
-../default
diff --git a/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands b/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands
deleted file mode 100755
index f0eb85010b..0000000000
--- a/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands
+++ /dev/null
@@ -1,8 +0,0 @@
-./xmlchange DATM_CPLHIST_CASE=cam6ctsm51_cesm23a12c_ne30pg3g17_CPLHIST_1850
-./xmlchange DATM_CPLHIST_DIR='$DIN_LOC_ROOT/atm/datm7/atm_forcing.cdeps_datm.CPLHIST_cam6ctsm51_cesm23a12c_ne30pg3g17_1850'
-./xmlchange DATM_YR_START=1
-./xmlchange DATM_YR_END=1
-./xmlchange DATM_YR_ALIGN=1
-
-# Needed until we have cplhist forcing with ndep - see https://github.com/escomp/ctsm/issues/1844
-./xmlchange DATM_PRESNDEP=none

From f7e9759754742e89e4050f73ca51f3629f011245 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Fri, 3 Apr 2026 15:54:09 -0600
Subject: [PATCH 2/4] Remove the cplhist testmod from the testlist

---
 cime_config/testdefs/testlist_clm.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 1ca49f9ce1..ebdcd77897 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -2540,7 +2540,7 @@
       <option name="comment">Simple test to make sure the basic Fates-SP compset works"</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/cplhist">
+  <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -2549,7 +2549,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/cplhist--clm/matrixcnOn">
+  <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/default--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -2557,7 +2557,7 @@
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment">Repeat last SMS_D_Ld1...cplhist test with matrixcnOn"</option>
+      <option name="comment">Repeat last SMS_D_Ld1...Spinup test with matrixcnOn"</option>
     </options>
   </test>
   <test name="SMS_D_Ld1_PS" grid="f19_f19_mg17" compset="I2010Clm50Sp" testmods="clm/clm50cam6LndTuningMode--clm/nofireemis">

From ee6aff1569e3642a8eb22b316705abb73b0ad4eb Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 Apr 2026 20:43:25 -0600
Subject: [PATCH 3/4] Set CO2 to diagnostic for CPLHIST mode with CLM60, and
 set so that NDEP comes from ATM for 1850 compsets

---
 cime_config/config_component.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 366b504d3e..caffebbcbb 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -303,6 +303,7 @@ Caveats:
       <value compset="_BGC%BDRD"   >diagnostic</value>
       <value compset="_BGC%BPRP"   >prognostic</value>
       <value compset="HIST.*_DATM" >diagnostic</value>
+      <value compset="DATM%CPLHIST_CLM60" >diagnostic</value>
       <value compset="SSP.*_DATM"  >diagnostic</value>
     </values>
     <group>run_component_ctsm</group>
@@ -337,6 +338,7 @@ Caveats:
     <default_value>FALSE</default_value>
     <values>
       <value compset="_CAM" >TRUE</value>
+      <value compset="1850_DATM%[^_]_CLM60">TRUE</value>
     </values>
     <group>run_component_ctsm</group>
     <file>env_run.xml</file>

From 61dc756fe8ac0db9c8c55c98e98870cd9008bfbc Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 Apr 2026 21:05:38 -0600
Subject: [PATCH 4/4] Add a Clm60 BgcCrop spinup compset

---
 cime_config/config_compsets.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index a1c6a1128d..16842337d7 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -559,6 +559,12 @@
     <lname>1850_DATM%CPLHIST_CLM50%BGC_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>I1850Clm60BgcCropSpinup</alias>
+    <lname>1850_DATM%CPLHIST_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
+  </compset>
+
+
 <!-- I CLM50 NWP Compsets -->
 
   <!-- GSWP datm forcing, for global runs or regional runs outside the CONUS -->