From 62f8d216ee908774c4a0b270085845737e1a96c9 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Thu, 25 Jun 2026 14:21:45 -0600
Subject: [PATCH 1/2] Revert "Temporarily remove datm cplhist test"

This reverts commit bd777a4d4cbcd7c42c9973caf240ae49a9c63086.
---
 datm/cime_config/testdefs/testlist_datm.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/datm/cime_config/testdefs/testlist_datm.xml b/datm/cime_config/testdefs/testlist_datm.xml
index 5ca19b919..361c38b7d 100644
--- a/datm/cime_config/testdefs/testlist_datm.xml
+++ b/datm/cime_config/testdefs/testlist_datm.xml
@@ -43,6 +43,15 @@
       <option name="wallclock"> 00:10:00 </option>
     </options>
   </test>
+  <test compset="1850_DATM%CPLHIST_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mt232" name="SMS_Ld5" testmods="datm/cplhist">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_cdeps"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 00:10:00 </option>
+      <option name="comment">Make sure CPLHIST mode will run</option>
+    </options>
+  </test>
   <test compset="1850_DATM%CRUJRA2024b_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mt232" name="SMS_D_Ld5" testmods="datm/cplhist_create">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cdeps"/>

From 40d2785b1f344372782ec95a5845cfa48d690ffc Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Thu, 25 Jun 2026 16:02:23 -0600
Subject: [PATCH 2/2] Increase dtlimit for the CPLHIST options so that the
 CPLHIST test will work and fixes #408

---
 datm/cime_config/stream_definition_datm.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml
index 2f9382975..ad3f31a09 100644
--- a/datm/cime_config/stream_definition_datm.xml
+++ b/datm/cime_config/stream_definition_datm.xml
@@ -3839,7 +3839,7 @@
       <taxmode>cycle</taxmode>
     </stream_taxmode>
     <stream_dtlimit>
-      <dtlimit>3.0</dtlimit>
+      <dtlimit>1.e30</dtlimit>
     </stream_dtlimit>
     <stream_readmode>single</stream_readmode>
   </stream_entry>
@@ -5217,7 +5217,7 @@
       <taxmode>cycle</taxmode>
     </stream_taxmode>
     <stream_dtlimit>
-      <dtlimit>3.0</dtlimit>
+      <dtlimit>1.e30</dtlimit>
     </stream_dtlimit>
     <stream_readmode>single</stream_readmode></stream_entry>
 
@@ -5260,7 +5260,7 @@
       <taxmode>cycle</taxmode>
     </stream_taxmode>
     <stream_dtlimit>
-      <dtlimit>3.0</dtlimit>
+      <dtlimit>1.e30</dtlimit>
     </stream_dtlimit>
     <stream_readmode>single</stream_readmode>
   </stream_entry>
@@ -5291,7 +5291,7 @@
       <taxmode>cycle</taxmode>
     </stream_taxmode>
     <stream_dtlimit>
-      <dtlimit>3.0</dtlimit>
+      <dtlimit>1.e30</dtlimit>
     </stream_dtlimit>
     <stream_readmode>single</stream_readmode>
   </stream_entry>
@@ -5325,7 +5325,7 @@
       <taxmode>cycle</taxmode>
     </stream_taxmode>
     <stream_dtlimit>
-      <dtlimit>3.0</dtlimit>
+      <dtlimit>1.e30</dtlimit>
     </stream_dtlimit>
     <stream_readmode>single</stream_readmode>
   </stream_entry>
@@ -5360,7 +5360,7 @@
       <taxmode>cycle</taxmode>
     </stream_taxmode>
     <stream_dtlimit>
-      <dtlimit>3.0</dtlimit>
+      <dtlimit>1.e30</dtlimit>
     </stream_dtlimit>
     <stream_readmode>single</stream_readmode>
   </stream_entry>
@@ -5398,7 +5398,7 @@
       <taxmode>cycle</taxmode>
     </stream_taxmode>
     <stream_dtlimit>
-      <dtlimit>3.0</dtlimit>
+      <dtlimit>1.e30</dtlimit>
     </stream_dtlimit>
     <stream_readmode>single</stream_readmode>
   </stream_entry>
@@ -5430,7 +5430,7 @@
       <taxmode>cycle</taxmode>
     </stream_taxmode>
     <stream_dtlimit>
-      <dtlimit>3.0</dtlimit>
+      <dtlimit>1.e30</dtlimit>
     </stream_dtlimit>
     <stream_readmode>single</stream_readmode>
   </stream_entry>