Merge pull request #3299 from billsacks/eri_transient_testmod

Add a testmod that allows transient ERI tests to work

Author: slevis-lmwg

cime_config/testdefs/testlist_clm.xml

@@ -821,6 +821,16 @@
       <option name="comment">Repeat last ERP_D...decStart test with matrixcnOn</option>
     </options>
   </test>
+  <test name="ERI_D_Ld20" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm-default--clm/midDecStart--clm-allowTransientYearJump">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_clm"/>
+      <machine name="izumi" compiler="nag" category="aux_clm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">ERI test for a transient case across the year boundary, with the restart on the first year side (DEBUG to work on izumi_nag)</option>
+    </options>
+  </test>
   <test name="ERP_D_Ld3_P64x2" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/default">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>

cime_config/testdefs/testmods_dirs/clm/allowTransientYearJump/README

@@ -0,0 +1,8 @@
+This testmod has changes that are needed in transient (e.g., HIST) tests that have a jump
+in years relative to an initial conditions file. For example, this comes up in the ERI
+test, where the hybrid run starts two years later than the initial run.
+
+This testmod is meant to be a mix-in with other testmods (e.g.,
+'clm-something--clm-allowTransientYearJump'), so it does not have an include of the
+default testmod or any other testmods (it is assumed that any needed includes come from
+the primary testmod of the test, and that this is just added on top of that).

cime_config/testdefs/testmods_dirs/clm/allowTransientYearJump/shell_commands

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+./xmlchange REST_OPTION='$STOP_OPTION'
+

cime_config/testdefs/testmods_dirs/clm/allowTransientYearJump/user_nl_clm

@@ -0,0 +1,3 @@
+
+check_finidat_year_consistency = .false.
+for_testing_allow_non_annual_changes = .true.