From 49382ee62b6d51b60606b3b7c436c18d35132993 Mon Sep 17 00:00:00 2001
From: Sam Rabin <sam.rabin@gmail.com>
Date: Wed, 4 Sep 2024 16:52:09 -0600
Subject: [PATCH] Update CDEPS external to 3f36622.

Branch ssp-fix: "anomaly_forcing now automatically set based on compset (ISSP*)." Also updates testmods accordingly.
---
 .gitmodules                                   |  2 +-
 cime_config/testdefs/testlist_clm.xml         | 40 +++++++++++++++++++
 .../clm/datm_ssp126_anom_forc/user_nl_datm    |  1 -
 .../clm/datm_ssp245_anom_forc/user_nl_datm    |  1 -
 .../clm/datm_ssp370_anom_forc/user_nl_datm    |  1 -
 .../clm/datm_ssp585_anom_forc/user_nl_datm    |  1 -
 components/cdeps                              |  2 +-
 7 files changed, 42 insertions(+), 6 deletions(-)
 delete mode 100644 cime_config/testdefs/testmods_dirs/clm/datm_ssp126_anom_forc/user_nl_datm
 delete mode 100644 cime_config/testdefs/testmods_dirs/clm/datm_ssp245_anom_forc/user_nl_datm
 delete mode 100644 cime_config/testdefs/testmods_dirs/clm/datm_ssp370_anom_forc/user_nl_datm
 delete mode 100644 cime_config/testdefs/testmods_dirs/clm/datm_ssp585_anom_forc/user_nl_datm

diff --git a/.gitmodules b/.gitmodules
index b010ad89a2..37a3f9624f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -92,7 +92,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 [submodule "cdeps"]
 path = components/cdeps
 url = https://github.com/samsrabin/CDEPS.git
-fxtag = 547506603e1f3ac302f16e70b448d74a84947341
+fxtag = 3f36622b3bd6358d324f1aca5e90009db306963e
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index f8e8d3208f..f2bd123c84 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -1989,6 +1989,7 @@
     <machines>
       <machine name="izumi" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="nvhpc" category="aux_clm"/>
+      <machine name="derecho" compiler="intel" category="ssp"/>
       <machine name="izumi" compiler="gnu" category="aux_clm"/>
     </machines>
     <options>
@@ -2551,6 +2552,45 @@
       <option name="comment"  >Transient production with anomaly forcing future scenario SSP5-8.5 case</option>
     </options>
   </test>
+  
+    <test name="SMS_D_Ld5" grid="f09_g17" compset="ISSP126Clm50BgcCrop" testmods="clm/default">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_clm"/>
+      <machine name="derecho" compiler="intel" category="ssp"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Transient production with anomaly forcing future scenario SSP1-2.6 case</option>
+    </options>
+  </test>
+  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="ISSP245Clm50BgcCrop" testmods="clm/default">
+    <machines>
+      <machine name="derecho" compiler="intel" category="ssp"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Transient production with anomaly forcing future scenario SSP2-4.5 case</option>
+    </options>
+  </test>
+  <test name="SMS_D_Ld5" grid="f09_g17" compset="ISSP370Clm50BgcCrop" testmods="clm/default">
+    <machines>
+      <machine name="derecho" compiler="intel" category="ssp"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Transient production with anomaly forcing future scenario SSP3-7.0 case</option>
+    </options>
+  </test>
+  <test name="SMS_D_Ld5" grid="f09_g17" compset="ISSP585Clm50BgcCrop" testmods="clm/default">
+    <machines>
+      <machine name="derecho" compiler="intel" category="ssp"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Transient production with anomaly forcing future scenario SSP5-8.5 case</option>
+    </options>
+  </test>
+
 
   <test name="ERP_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm50Bgc" testmods="clm/nlevgrnd_small">
     <machines>
diff --git a/cime_config/testdefs/testmods_dirs/clm/datm_ssp126_anom_forc/user_nl_datm b/cime_config/testdefs/testmods_dirs/clm/datm_ssp126_anom_forc/user_nl_datm
deleted file mode 100644
index 83878d7e4c..0000000000
--- a/cime_config/testdefs/testmods_dirs/clm/datm_ssp126_anom_forc/user_nl_datm
+++ /dev/null
@@ -1 +0,0 @@
-anomaly_forcing = 'Anomaly.Forcing.cmip6.ssp126'
diff --git a/cime_config/testdefs/testmods_dirs/clm/datm_ssp245_anom_forc/user_nl_datm b/cime_config/testdefs/testmods_dirs/clm/datm_ssp245_anom_forc/user_nl_datm
deleted file mode 100644
index 148091362d..0000000000
--- a/cime_config/testdefs/testmods_dirs/clm/datm_ssp245_anom_forc/user_nl_datm
+++ /dev/null
@@ -1 +0,0 @@
-anomaly_forcing = 'Anomaly.Forcing.cmip6.ssp245'
diff --git a/cime_config/testdefs/testmods_dirs/clm/datm_ssp370_anom_forc/user_nl_datm b/cime_config/testdefs/testmods_dirs/clm/datm_ssp370_anom_forc/user_nl_datm
deleted file mode 100644
index 082d916c2e..0000000000
--- a/cime_config/testdefs/testmods_dirs/clm/datm_ssp370_anom_forc/user_nl_datm
+++ /dev/null
@@ -1 +0,0 @@
-anomaly_forcing = 'Anomaly.Forcing.cmip6.ssp370'
diff --git a/cime_config/testdefs/testmods_dirs/clm/datm_ssp585_anom_forc/user_nl_datm b/cime_config/testdefs/testmods_dirs/clm/datm_ssp585_anom_forc/user_nl_datm
deleted file mode 100644
index d218ac45b7..0000000000
--- a/cime_config/testdefs/testmods_dirs/clm/datm_ssp585_anom_forc/user_nl_datm
+++ /dev/null
@@ -1 +0,0 @@
-anomaly_forcing = 'Anomaly.Forcing.cmip6.ssp585'
diff --git a/components/cdeps b/components/cdeps
index 547506603e..3f36622b3b 160000
--- a/components/cdeps
+++ b/components/cdeps
@@ -1 +1 @@
-Subproject commit 547506603e1f3ac302f16e70b448d74a84947341
+Subproject commit 3f36622b3bd6358d324f1aca5e90009db306963e