From 3ec9215c09004385621f6523ca68c8eb2a55bd48 Mon Sep 17 00:00:00 2001
From: Sam Rabin <sam.rabin@gmail.com>
Date: Mon, 7 Oct 2024 15:51:49 -0600
Subject: [PATCH 1/2] Remove include_user_mods from matrixcnOn testmod.

Should avoid unnecessary levels of history writing.
Resolves ESCOMP/CTSM#2814.
---
 cime_config/testdefs/testlist_clm.xml                           | 2 +-
 .../testdefs/testmods_dirs/clm/matrixcnOn/include_user_mods     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 cime_config/testdefs/testmods_dirs/clm/matrixcnOn/include_user_mods

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 0eb3d5012d..7943b5c55e 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -3332,7 +3332,7 @@
       <option name="tput_tolerance">0.1</option>
     </options>
   </test>
-  <test name="PFS_Ld10_PS" grid="f19_g17" compset="I2000Clm50BgcCrop" testmods="clm/matrixcnOn">
+  <test name="PFS_Ld10_PS" grid="f19_g17" compset="I2000Clm50BgcCrop" testmods="clm/default--clm/matrixcnOn">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
     </machines>
diff --git a/cime_config/testdefs/testmods_dirs/clm/matrixcnOn/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/matrixcnOn/include_user_mods
deleted file mode 100644
index fe0e18cf88..0000000000
--- a/cime_config/testdefs/testmods_dirs/clm/matrixcnOn/include_user_mods
+++ /dev/null
@@ -1 +0,0 @@
-../default

From ae6b18844d186c10a369f62aa749b940d40714c0 Mon Sep 17 00:00:00 2001
From: Sam Rabin <sam.rabin@gmail.com>
Date: Mon, 7 Oct 2024 20:59:31 -0600
Subject: [PATCH 2/2] Change a test wallclock time to ensure it's what we want.

---
 cime_config/testdefs/testlist_clm.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 7943b5c55e..cdb00db524 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -1333,7 +1333,7 @@
       <machine name="derecho" compiler="intel" category="aux_clm"/>
     </machines>
     <options>
-      <option name="wallclock">01:40:00</option>
+      <option name="wallclock">01:40:01</option>
       <option name="comment"  >Multi-year global test of transient crops together with transient glaciers. Use no-evolve glaciers with ERP test</option>
     </options>
   </test>