Merge tag 'rtm1_0_82' into zerothtstep

time in hist now equals the middle of the time_bounds RTM equivalent to CTSM work done in ESCOMP/CTSM#2838 Answers change only for the time variable.
olyson · Nov 11, 2024 · 6d42124 · 6d42124
2 parents 813320f + 1d10716
commit 6d42124
Show file tree

Hide file tree

Showing 12 changed files with 224 additions and 940 deletions.
diff --git a/README.rst b/README.rst
@@ -2,8 +2,20 @@
 River Transport Model
 =====================
 
-The River Transport Model, RTM, is part of the Community Earth System Model.
+The River Transport Model, RTM, is part of the Community Earth System Model (CESM).
+It is managed by the Land Model Working Group (LMWG) as a part of CESM.
 
 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**
+
+RTM is part of CESM3, but it's only supported use is for Paleo
+work, and other uses should use MOSART.
+
+**IMPORTANT NOTE: RTM's planned successor is mizuRoute**
+
+Longer term RTM will be removed in future versions of CESM and the new model
+mizuRoute will be used for Paleo work.
+
diff --git a/cime_config/buildlib b/cime_config/buildlib
@@ -9,7 +9,7 @@ import os, sys
 CIMEROOT = os.environ.get("CIMEROOT")
 if CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-sys.path.append(os.path.join(CIMEROOT, "scripts", "Tools"))
+sys.path.append(os.path.join(CIMEROOT, "CIME", "Tools"))
 
 from standard_script_setup import *
 from CIME.case import Case

diff --git a/cime_config/buildnml b/cime_config/buildnml
@@ -14,7 +14,7 @@ import os, sys, glob
 CIMEROOT = os.environ.get("CIMEROOT")
 if CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-sys.path.append(os.path.join(CIMEROOT, "scripts", "Tools"))
+sys.path.append(os.path.join(CIMEROOT, "CIME", "Tools"))
 
 from standard_script_setup import *
 from CIME.case import Case

diff --git a/cime_config/testdefs/testlist_rtm.xml b/cime_config/testdefs/testlist_rtm.xml
@@ -1,91 +1,117 @@
 <?xml version="1.0"?>
 <testlist version="2.0">
 
-  <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
+  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm45Sp" testmods="rtm/default">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm"></machine>
-      <machine name="cheyenne" compiler="gnu" category="rtm"></machine>
-      <machine name="izumi" compiler="nag" category="rtm"></machine>
+      <machine name="derecho" compiler="intel" category="rtm"></machine>
     </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 with DEBUG on</option>
     </options>
   </test>
-  <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
+  <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50SpRtmFl" testmods="rtm/default">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm"></machine>
-      <machine name="cheyenne" compiler="gnu" category="rtm"></machine>
-      <machine name="izumi" compiler="nag" category="rtm"></machine>
+      <machine name="derecho" compiler="intel" category="rtm"></machine>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Restart test with DEBUG on</option>
+    </options>
+  </test>
+  <test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/default">
+    <machines>
+      <machine name="derecho" compiler="intel" category="rtm"></machine>
+      <machine name="derecho" compiler="gnu" category="rtm"></machine>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</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="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/default">
+    <machines>
+      <machine name="derecho" compiler="intel" category="rtm"></machine>
+      <machine name="derecho" compiler="gnu" category="rtm"></machine>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
       <option name="comment"  >Run with DEBUG compiler option all machine/compilers</option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmColdStart">
+  <test name="SMS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmColdStart">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm"></machine>
-      <machine name="cheyenne" compiler="gnu" category="rtm"></machine>
-      <machine name="izumi" compiler="nag" category="rtm"></machine>
+      <machine name="derecho" compiler="intel" category="rtm"></machine>
+      <machine name="derecho" compiler="gnu" category="rtm"></machine>
     </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">
+  <test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnIceOff">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm">
+      <machine name="derecho" compiler="intel" category="rtm">
          <options>
            <option name="wallclock">00:20:00</option>
          </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">
+  <test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm">
+      <machine name="derecho" compiler="intel" category="rtm">
         <options>
           <option name="wallclock">00:20:00</option>
         </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">
+  <test name="ERS_D_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm">
+      <machine name="derecho" compiler="intel" category="rtm">
         <options>
           <option name="wallclock">00:20:00</option>
         </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">
+  <test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOff">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm">
+      <machine name="derecho" compiler="intel" category="rtm">
         <options>
           <option name="wallclock">00:20:00</option>
         </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">
+  <test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOff">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm">
+      <machine name="derecho" compiler="intel" category="rtm">
         <options>
           <option name="wallclock">00:20:00</option>
         </options>
       </machine>
     </machines>
-  </test>
-  <test name="SMS_D_Ld5_Vmct" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
-    <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm"></machine>
-    </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment"  >Run with DEBUG compiler option with the MCT driver/option</option>
+      <option name="comment"  >Run for RTM off</option>
     </options>
   </test>
 

diff --git a/docs/ChangeLog b/docs/ChangeLog
@@ -1,3 +1,39 @@
+===============================================================
+Tag name:  rtm1_0_80
+Originator(s): swensosc
+Date: Jun 21, 2024
+One-line Summary: fix area scaling to correct RTM river flux to MOM6
+
+Fix how area is applied to input runoff for rtm
+
+Resolves #50
+
+Pull Requests:
+
+ #51
+
+===============================================================
+Tag name:  rtm1_0_79
+Originator(s): mvertens/erik
+Date: Jan 27, 2024
+One-line Summary: Remove MCT from RTM
+
+This tag removes MCT code that is no longer used since it is only in the mct cap.
+Also updates the testlist to be moved to Derecho, removing izumi
+
+Erik added some changes to this that were important for RTM as a maintainer of
+RTM which cover the following issues:
+
+Resolves #45 -- failing tests
+Resolves #44 -- lower testing for RTM (remove Izumi tests)
+Resolves #41 -- Move testlist from Cheyenne to Derecho
+Resolves #33 -- Update path to CIME tools needed for buildnml/buildlib
+
+Pull Requests:
+
+ #42 -- Remove MCT
+ #40 -- Update README and test comments
+
 ===============================================================
 Tag name:  rtm1_0_78
 Originator(s): erik