From c13bedefdef56f7ca5cc7b5712561854fa55244f Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Fri, 30 Apr 2021 22:11:15 -0600
Subject: [PATCH] Set default years for 1PT to 2018 to 2019, and for NEON in
 streams set to DATM_YR_ variables instead of hardcoded values

---
 datm/cime_config/config_component.xml       | 4 ++--
 datm/cime_config/stream_definition_datm.xml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml
index d5639c3fb..a2cb46aa9 100644
--- a/datm/cime_config/config_component.xml
+++ b/datm/cime_config/config_component.xml
@@ -206,7 +206,7 @@
     <valid_values></valid_values>
     <default_value>2004</default_value>
     <values match="last">
-      <value compset="2000.*_DATM%1PT">1972</value>
+      <value compset="2000.*_DATM%1PT">2018</value>
       <value compset="1850.*_DATM%QIA">1948</value>
       <value compset="1850.*_DATM%CRU">1901</value>
       <value compset="1850.*_DATM%GSW">1901</value>
@@ -248,7 +248,7 @@
     <valid_values></valid_values>
     <default_value>2004</default_value>
     <values match="last">
-      <value   compset="2000.*_DATM%1PT">2004</value>
+      <value   compset="2000.*_DATM%1PT">2019</value>
       <value   compset="1850.*_DATM%QIA">1972</value>
       <value   compset="1850.*_DATM%CRU">1920</value>
       <value   compset="1850.*_DATM%GSW">1920</value>
diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml
index b42425bbc..2e16bba04 100644
--- a/datm/cime_config/stream_definition_datm.xml
+++ b/datm/cime_config/stream_definition_datm.xml
@@ -203,7 +203,7 @@
       <meshfile>none</meshfile>
     </stream_meshfile>
     <stream_datafiles>
-      <file first_year="2018" last_year="2019">$DIN_LOC_ROOT/atm/cdeps/v1/$NEONSITE/%ym.nc</file>
+      <file first_year="$DATM_YR_START" last_year="$DATM_YR_END">$DIN_LOC_ROOT/atm/cdeps/v1/$NEONSITE/%ym.nc</file>
     </stream_datafiles>
     <stream_datavars>
       <var>PRECTmms Faxa_precn</var>
@@ -220,9 +220,9 @@
       <mapalgo>none</mapalgo>
     </stream_mapalgo>
     <stream_vectors>null</stream_vectors>
-    <stream_year_align>2018</stream_year_align>
-    <stream_year_first>2018</stream_year_first>
-    <stream_year_last>2019</stream_year_last>
+    <stream_year_align>$DATM_YR_ALIGN</stream_year_align>
+    <stream_year_first>$DATM_YR_START</stream_year_first>
+    <stream_year_last>$DATM_YR_END</stream_year_last>
     <stream_offset>0</stream_offset>
     <stream_tintalgo>
       <tintalgo>linear</tintalgo>