From d9f75e9f41631c98d3268bb2d600c414c86120d0 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 Apr 2026 14:05:23 -0600
Subject: [PATCH 1/6] Set defaults for DATM_CPLHIST_* settings for 1850 with
 DATM coupled to CLM

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

diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml
index 8c91d7fe2..3bff174e8 100644
--- a/datm/cime_config/config_component.xml
+++ b/datm/cime_config/config_component.xml
@@ -204,6 +204,9 @@
     <type>char</type>
     <valid_values></valid_values>
     <default_value>UNSET</default_value>
+    <values match="last">
+      <value compset="1850.*_DATM%CPLHIST_CLM">$DIN_LOC_ROOT/cplhist/cesm3_0/$DATM_CPLHIST_CASE/atm</value>
+    </values>
     <group>run_component_datm</group>
     <file>env_run.xml</file>
     <desc>directory for coupler history data mode (only used for when DATM_MODE is CPLHIST)</desc>
@@ -213,6 +216,9 @@
     <type>char</type>
     <valid_values></valid_values>
     <default_value>UNSET</default_value>
+    <values match="last">
+      <value compset="1850.*_DATM%CPLHIST_CLM">CAM7CLM6_cesm30alpha08c_ne30pg3_1850</value>
+    </values>
     <group>run_component_datm</group>
     <file>env_run.xml</file>
     <desc>case name used to determine stream filenames when DATM_MODE is CPLHIST</desc>
@@ -228,6 +234,7 @@
       <value compset="1850.*_DATM%CRUJRA2024[b]*">1</value>
       <value compset="1850.*_DATM%CRUv7">1</value>
       <value compset="1850.*_DATM%GSW">1</value>
+      <value compset="1850.*_DATM%CPLHIST_CLM">1</value>
       <value compset="HIST.*_DATM%QIA">1895</value>
       <value compset="HIST.*_DATM%CRUJRA2024[b]*">1901</value>
       <value compset="HIST.*_DATM%CRUv7">1901</value>
@@ -277,6 +284,7 @@
       <value compset="1850.*_DATM%CRUv7">1901</value>
       <value compset="1850.*_DATM%GSW">1901</value>
       <value compset="1850.*_DATM%NLDAS2">0</value>  <!-- Unsupported -->
+      <value compset="1850.*_DATM%CPLHIST_CLM">1</value>
       <value compset="2000.*_DATM%WISOQIA">2000</value>
       <value compset="2000.*_DATM%QIA">1972</value>
       <value compset="HIST.*_DATM%QIA">1948</value>
@@ -339,6 +347,7 @@
       <value   compset="1850.*_DATM%CRUv7">1920</value>
       <value   compset="1850.*_DATM%GSW">1920</value>
       <value   compset="1850.*_DATM%NLDAS2">-1</value>  <!-- Unsupported -->
+      <value   compset="1850.*_DATM%CPLHIST_CLM">3</value>
       <value   compset="2000.*_DATM%WISOQIA">2004</value>
       <value   compset="2000.*_DATM%QIA">2004</value>
       <value   compset="HIST.*_DATM%QIA">1972</value>

From 67a8f18c82efe81679e30c1867577b9c8cb50fdb Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 Apr 2026 14:14:49 -0600
Subject: [PATCH 2/6] Make the default setting for DATM_CPLHIST_DIR under the
 users archive directory location for the DATM_CPLHIST_CASE under cpl/hist
 subdirectory

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

diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml
index 3bff174e8..34ec75d0b 100644
--- a/datm/cime_config/config_component.xml
+++ b/datm/cime_config/config_component.xml
@@ -203,7 +203,7 @@
   <entry id="DATM_CPLHIST_DIR">
     <type>char</type>
     <valid_values></valid_values>
-    <default_value>UNSET</default_value>
+    <default_value>$CIME_OUTPUT_ROOT/archive/$DATM_CPLHIST_CASE/cpl/hist</default_value>
     <values match="last">
       <value compset="1850.*_DATM%CPLHIST_CLM">$DIN_LOC_ROOT/cplhist/cesm3_0/$DATM_CPLHIST_CASE/atm</value>
     </values>

From fcb28adce89a36b0de6855bf3e7371bbb7ded9e5 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 Apr 2026 14:30:45 -0600
Subject: [PATCH 3/6] Correct the filenames for cplhist mode for PRES_NDEP

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

diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml
index c7460c200..eb77586f0 100644
--- a/datm/cime_config/stream_definition_datm.xml
+++ b/datm/cime_config/stream_definition_datm.xml
@@ -5238,7 +5238,7 @@
       <meshfile>$ATM_DOMAIN_MESH</meshfile>
     </stream_meshfile>
     <stream_datafiles>
-      <file first_year="$DATM_YR_START" last_year="$DATM_YR_END">$DATM_CPLHIST_DIR/$DATM_CPLHIST_CASE.cpl.ha2x1d.%ym.nc</file>
+      <file first_year="$DATM_YR_START" last_year="$DATM_YR_END" filename_advance_days='1'>$DATM_CPLHIST_DIR/$DATM_CPLHIST_CASE.cpl.hx.atm.24h.avrg.%ymd-00000.nc</file>
     </stream_datafiles>
     <stream_datavars>
       <var>a2x1d_Faxa_ndep  Faxa_ndep</var>

From a72518b9c2782df1b3459ff492c9f622513e538a Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 Apr 2026 20:44:18 -0600
Subject: [PATCH 4/6] Add clim_1850_cesm3_for_cmip7

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

diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml
index 34ec75d0b..8dfe25253 100644
--- a/datm/cime_config/config_component.xml
+++ b/datm/cime_config/config_component.xml
@@ -104,7 +104,7 @@
 
   <entry id="DATM_PRESNDEP">
     <type>char</type>
-    <valid_values>none,clim_1850_cmip7,clim_2000_cmip7,clim_2010_cmip7,hist_cmip7,clim_1850_cmip6,clim_2000_cmip6,clim_2010_cmip6,hist_cmip6,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP5-3.4,SSP5-8.5,cplhist</valid_values>
+    <valid_values>none,clim_1850_cesm3_for_cmip7,clim_1850_cmip7,clim_2000_cmip7,clim_2010_cmip7,hist_cmip7,clim_1850_cmip6,clim_2000_cmip6,clim_2010_cmip6,hist_cmip6,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP5-3.4,SSP5-8.5,cplhist</valid_values>
     <default_value>clim_2000</default_value>
     <values match="last">
       <value compset="^1850[CE]?_"  >clim_1850_cmip6</value>

From b6ebc5c8fd6b244987d63be81dd9b08bd8302092 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 Apr 2026 20:50:06 -0600
Subject: [PATCH 5/6] Add clim_1850_cesm3_for_cmip7

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

diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml
index eb77586f0..ef0b0a0e4 100644
--- a/datm/cime_config/stream_definition_datm.xml
+++ b/datm/cime_config/stream_definition_datm.xml
@@ -4891,6 +4891,46 @@
     <stream_readmode>single</stream_readmode>
   </stream_entry>
 
+  <stream_entry name="presndep.clim_1850_cesm3_for_cmip7">
+    <stream_meshfile>
+      <meshfile>$DIN_LOC_ROOT/share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</meshfile>
+    </stream_meshfile>
+    <stream_datafiles>
+      <file>$DIN_LOC_ROOT/atm/cam/chem/trop_strat_mam5_ts4_aero_spinup/ndep/fndep_clm_B1850C_MT4s.1850monthly.ne30_c251220.nc</file>
+    </stream_datafiles>
+    <stream_datavars>
+      <!-- the following stream fields are in units of g/m2/sec - need conversion to kg/m2/sec-->
+      <var>NDEP_NHx_month  Faxa_ndep_nhx</var>
+      <var>NDEP_NOy_month  Faxa_ndep_noy</var>
+      <!-- Alturnative form to use:
+      the following stream fields are in units of kg/m2/sec - so need no unit conversion
+      <var>dry_deposition_NHx_as_N Faxa_ndep_nhx_dry</var>
+      <var>wet_deposition_NHx_as_N Faxa_ndep_nhx_wet</var>
+      <var>dry_deposition_NOy_as_N Faxa_ndep_noy_dry</var>
+      <var>wet_deposition_NOy_as_N Faxa_ndep_noy_wet</var>
+      -->
+    </stream_datavars>
+    <stream_lev_dimname>null</stream_lev_dimname>
+    <stream_mapalgo>
+      <mapalgo>bilinear</mapalgo>
+    </stream_mapalgo>
+    <stream_vectors>null</stream_vectors>
+    <stream_year_align>1</stream_year_align>
+    <stream_year_first>1850</stream_year_first>
+    <stream_year_last>1850</stream_year_last>
+    <stream_offset>0</stream_offset>
+    <stream_tintalgo>
+      <tintalgo>linear</tintalgo>
+    </stream_tintalgo>
+    <stream_taxmode>
+      <taxmode>cycle</taxmode>
+    </stream_taxmode>
+    <stream_dtlimit>
+      <dtlimit>1.5</dtlimit>
+    </stream_dtlimit>
+    <stream_readmode>single</stream_readmode>
+  </stream_entry>
+
   <stream_entry name="presndep.clim_1850_cmip6">
     <stream_meshfile>
       <meshfile>$DIN_LOC_ROOT/share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</meshfile>

From ab6e2d7693bf29704fe48f0252f800e8d4a1de2f Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 Apr 2026 21:00:02 -0600
Subject: [PATCH 6/6] CPLHIST settings for CLM should be just CLM60, to
 preserve older answers

---
 datm/cime_config/config_component.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml
index 8dfe25253..58729753e 100644
--- a/datm/cime_config/config_component.xml
+++ b/datm/cime_config/config_component.xml
@@ -174,6 +174,7 @@
       <value compset="^SSP460_">SSP4-6.0</value>
       <value compset="^SSP534_">SSP5-3.4</value>
       <value compset="^SSP585_">SSP5-8.5</value>
+      <value compset="^1850.*_DATM%CPLHIST_CLM60">cmip7_20tr</value>
       <value compset="^HIST[CE]?_">cmip6_20tr</value>
       <value compset="^20TR"   >cmip6_20tr</value>
       <value compset="^OMIP_DATM%IAF.*_POP2%[^_]*ECO">omip.iaf</value>
@@ -205,7 +206,7 @@
     <valid_values></valid_values>
     <default_value>$CIME_OUTPUT_ROOT/archive/$DATM_CPLHIST_CASE/cpl/hist</default_value>
     <values match="last">
-      <value compset="1850.*_DATM%CPLHIST_CLM">$DIN_LOC_ROOT/cplhist/cesm3_0/$DATM_CPLHIST_CASE/atm</value>
+      <value compset="1850.*_DATM%CPLHIST_CLM60">$DIN_LOC_ROOT/cplhist/cesm3_0/$DATM_CPLHIST_CASE/atm</value>
     </values>
     <group>run_component_datm</group>
     <file>env_run.xml</file>
@@ -217,7 +218,7 @@
     <valid_values></valid_values>
     <default_value>UNSET</default_value>
     <values match="last">
-      <value compset="1850.*_DATM%CPLHIST_CLM">CAM7CLM6_cesm30alpha08c_ne30pg3_1850</value>
+      <value compset="1850.*_DATM%CPLHIST_CLM60">CAM7CLM6_cesm30alpha08c_ne30pg3_1850</value>
     </values>
     <group>run_component_datm</group>
     <file>env_run.xml</file>
@@ -234,7 +235,7 @@
       <value compset="1850.*_DATM%CRUJRA2024[b]*">1</value>
       <value compset="1850.*_DATM%CRUv7">1</value>
       <value compset="1850.*_DATM%GSW">1</value>
-      <value compset="1850.*_DATM%CPLHIST_CLM">1</value>
+      <value compset="1850.*_DATM%CPLHIST_CLM60">1</value>
       <value compset="HIST.*_DATM%QIA">1895</value>
       <value compset="HIST.*_DATM%CRUJRA2024[b]*">1901</value>
       <value compset="HIST.*_DATM%CRUv7">1901</value>
@@ -284,7 +285,7 @@
       <value compset="1850.*_DATM%CRUv7">1901</value>
       <value compset="1850.*_DATM%GSW">1901</value>
       <value compset="1850.*_DATM%NLDAS2">0</value>  <!-- Unsupported -->
-      <value compset="1850.*_DATM%CPLHIST_CLM">1</value>
+      <value compset="1850.*_DATM%CPLHIST_CLM60">1</value>
       <value compset="2000.*_DATM%WISOQIA">2000</value>
       <value compset="2000.*_DATM%QIA">1972</value>
       <value compset="HIST.*_DATM%QIA">1948</value>
@@ -347,7 +348,7 @@
       <value   compset="1850.*_DATM%CRUv7">1920</value>
       <value   compset="1850.*_DATM%GSW">1920</value>
       <value   compset="1850.*_DATM%NLDAS2">-1</value>  <!-- Unsupported -->
-      <value   compset="1850.*_DATM%CPLHIST_CLM">3</value>
+      <value   compset="1850.*_DATM%CPLHIST_CLM60">3</value>
       <value   compset="2000.*_DATM%WISOQIA">2004</value>
       <value   compset="2000.*_DATM%QIA">2004</value>
       <value   compset="HIST.*_DATM%QIA">1972</value>