Merge pull request ESCOMP#40 from ekluzek/moretestsmergeprs

Update README and comments

README.rst

@@ -7,3 +7,13 @@ The River Transport Model, RTM, is part of the Community Earth System Model.
 See the CESM web site for documentation and information:
 
 http://www.cesm.ucar.edu
+
+IMPORTANT NOTE: RTM is only used for Paleo work -- use MOSART or mizuRoute otherwise
+IMPORTANT NOTE: RTM's planned successor is mizuRoute
+
+RTM is part of CESM3, but it's only supported use is for Paleo
+work, and other uses should use MOSART.
+
+Longer term RTM will be removed in future versions of CESM and the new model
+mizuRoute will be used for Paleo work.
+

cime_config/testdefs/testlist_rtm.xml

@@ -8,7 +8,7 @@
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment"  >Restart test without DEBUG on all machines/compilers</option>
+      <option name="comment"  >Restart test without DEBUG on all machines/compilers (except nag because of a CTSM issue)</option>
     </options>
   </test>
   <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
@@ -28,7 +28,7 @@
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment"  >Run a Cold-Start with all machine/compilers</option>
+      <option name="comment"  >Run a Cold-Start with main machine all compilers</option>
     </options>
   </test>
   <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnIceOff">
@@ -39,6 +39,10 @@
          </options>
       </machine>
     </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Run with ice off</option>
+    </options>
   </test>
   <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
@@ -48,6 +52,10 @@
         </options>
       </machine>
     </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Run with flooding on and effective velocity on</option>
+    </options>
   </test>
   <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
@@ -57,6 +65,10 @@
         </options>
       </machine>
     </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Run with flooding on and effective velocity on, DEBUG on, all machines/compilers</option>
+    </options>
   </test>
   <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOff">
     <machines>
@@ -66,6 +78,10 @@
         </options>
       </machine>
     </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Run with flooding on and effective velocity off</option>
+    </options>
   </test>
   <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOff">
     <machines>
@@ -75,6 +91,10 @@
         </options>
       </machine>
     </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Run for RTM off</option>
+    </options>
   </test>
   <test name="SMS_D_Ld5_Vmct" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
     <machines>