From 18ac79080a0ee315c8e960f594fa16c771d1e90b Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Mon, 8 May 2023 17:35:40 -0600
Subject: [PATCH] Fix nuopc cplhist test

Make some changes to the cplhist testmod that should fix the cplhist
test, based on testing done by Keith Oleson:
- Point to new cplhist forcing data generated and used by Adam
  Herrington and Keith Oleson
- Use DATM_PRESNDEP=none until
  https://github.com/escomp/ctsm/issues/1844 is resolved

Also, remove mct cplhist test
---
 cime_config/testdefs/ExpectedTestFails.xml    |  7 -------
 cime_config/testdefs/testlist_clm.xml         | 11 +---------
 .../testmods_dirs/clm/cplhist/shell_commands  | 20 ++++++++-----------
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
index d9a1c1b6fd..24f7062798 100644
--- a/cime_config/testdefs/ExpectedTestFails.xml
+++ b/cime_config/testdefs/ExpectedTestFails.xml
@@ -44,13 +44,6 @@
     </phase>
   </test>
 
-  <test name="SMS_D_Ld1_PS.f09_g17.I1850Clm50BgcSpinup.cheyenne_intel.clm-cplhist">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#1844</issue>
-    </phase>
-  </test>
-
   <!-- fates test suite failures -->
 
   <test name="ERS_Lm12.1x1_brazil.I2000Clm50FatesCruRsGs.cheyenne_intel.clm-FatesFireLightningPopDens">
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 38125d80bc..475d5db97d 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -1306,7 +1306,7 @@
       <option name="comment"  >Simple test to make sure the basic Fates-SP compset works"</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1_PS" grid="f09_g17" compset="I1850Clm50BgcSpinup" testmods="clm/cplhist">
+  <test name="SMS_D_Ld1" grid="ne30pg3_t061" compset="I1850Clm50BgcSpinup" testmods="clm/cplhist">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
       <machine name="cheyenne" compiler="intel" category="prealpha"/>
@@ -1315,15 +1315,6 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_Vmct_D_Ld1_PS" grid="f09_g17" compset="I1850Clm50BgcSpinup" testmods="clm/cplhist">
-    <machines>
-      <machine name="cheyenne" compiler="intel" category="aux_clm"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:20:00</option>
-      <option name="comment"  >Spinup test with MCT driver</option>
-    </options>
-  </test>
   <test name="SMS_D_Ld1_PS" grid="f19_f19_mg17" compset="I2010Clm50Sp" testmods="clm/clm50cam6LndTuningMode">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
diff --git a/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands b/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands
index ac079d5334..a284aefcb9 100755
--- a/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands
+++ b/cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands
@@ -1,12 +1,8 @@
-driver=`./xmlquery --value COMP_INTERFACE`
-if [ "$driver" = "nuopc" ]; then
-   ./xmlchange DATM_YR_ALIGN=1
-   ./xmlchange DATM_YR_END=84
-   ./xmlchange DATM_YR_START=82
-else
-   ./xmlchange DATM_CPLHIST_YR_ALIGN=1
-   ./xmlchange DATM_CPLHIST_YR_END=84
-   ./xmlchange DATM_CPLHIST_YR_START=82
-fi
-./xmlchange DATM_CPLHIST_CASE=b.e20.B1850.f09_g17.pi_control.all.221.cplhist
-./xmlchange DATM_CPLHIST_DIR=/glade/p/cesm/bgcwg_dev/forcing/b.e20.B1850.f09_g17.pi_control.all.221.cplhist/cpl/hist.mon
+./xmlchange DATM_CPLHIST_CASE=cam6ctsm51_cesm23a12c_ne30pg3g17_CPLHIST_1850
+./xmlchange DATM_CPLHIST_DIR=/glade/p/cgd/tss/CTSM_datm_forcing_data/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