ctsm5.4.045: Answer changes with updates for CISM and mizuRoute

.gitmodules

@@ -36,7 +36,7 @@ fxDONOTUSEurl = https://github.com/NGEET/fates
 [submodule "cism"]
 path = components/cism
 url = https://github.com/ESCOMP/CISM-wrapper
-fxtag = cismwrap_2_2_013
+fxtag = cismwrap_2_2_015
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
@@ -60,7 +60,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
 [submodule "mizuRoute"]
 path = components/mizuRoute
 url = https://github.com/ESCOMP/mizuRoute
-fxtag = v3.0.1
+fxtag = v3.1.1
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute

cime_config/testdefs/ExpectedTestFails.xml

@@ -178,13 +178,6 @@
     </phase>
   </test>
 
-  <test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_gnu.mizuroute-default">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>ESCOMP/mizuRoute#613</issue>
-    </phase>
-  </test>
-
   <test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_gnu.mizuroute-default">
     <phase name="NLCOMP">
       <status>FAIL</status>
@@ -200,9 +193,9 @@
   </test>
 
   <test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default">
-    <phase name="MODEL_BUILD">
+    <phase name="RUN">
       <status>FAIL</status>
-      <issue>ESCOMP/mizuRoute#615</issue>
+      <issue>ESCOMP/mizuRoute#636</issue>
     </phase>
   </test>
 

cime_config/testdefs/testlist_clm.xml

@@ -862,7 +862,7 @@
       <machine name="izumi" compiler="nag" category="aux_clm"/>
     </machines>
     <options>
-      <option name="wallclock">00:20:00</option>
+      <option name="wallclock">00:40: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>
@@ -4411,6 +4411,16 @@
       <option name="comment">Add to CESM testing because mizuRoute can be sensitive to submodule changes</option>
     </options>
   </test>
+  <test name="ERS_D_Ld10" grid="5x5_amazon_r05" compset="I2000Clm60SpMizGs" testmods="mizuroute-default">
+    <machines>
+      <machine name="izumi" compiler="nag" category="aux_clm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">Parallel test of mizuRoute for the tiny 5x5_amazon r05 grid</option>
+      <option name="comment">Add to CESM testing because mizuRoute can be sensitive to submodule changes</option>
+    </options>
+  </test>
   <test name="ERI_Ld30" grid="nldas2_nldas2_rUSGS_mnldas2" compset="I2000Clm60SpMizGsNldas" testmods="mizuroute-default">
     <machines>
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>