Skip to content

Commit 6d42124

Browse files
slevis-lmwgslevis-lmwg
committed
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.
2 parents 813320f + 1d10716 commit 6d42124

File tree

12 files changed

+224
-940
lines changed

12 files changed

+224
-940
lines changed

‎README.rst‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,20 @@
22
River Transport Model
33
=====================
44

5-
The River Transport Model, RTM, is part of the Community Earth System Model.
5+
The River Transport Model, RTM, is part of the Community Earth System Model (CESM).
6+
It is managed by the Land Model Working Group (LMWG) as a part of CESM.
67

78
See the CESM web site for documentation and information:
89

910
http://www.cesm.ucar.edu
11+
12+
**IMPORTANT NOTE: RTM is only used for Paleo work -- use MOSART or mizuRoute otherwise**
13+
14+
RTM is part of CESM3, but it's only supported use is for Paleo
15+
work, and other uses should use MOSART.
16+
17+
**IMPORTANT NOTE: RTM's planned successor is mizuRoute**
18+
19+
Longer term RTM will be removed in future versions of CESM and the new model
20+
mizuRoute will be used for Paleo work.
21+

‎cime_config/buildlib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import os, sys
99
CIMEROOT = os.environ.get("CIMEROOT")
1010
if CIMEROOT is None:
1111
raise SystemExit("ERROR: must set CIMEROOT environment variable")
12-
sys.path.append(os.path.join(CIMEROOT, "scripts", "Tools"))
12+
sys.path.append(os.path.join(CIMEROOT, "CIME", "Tools"))
1313

1414
from standard_script_setup import *
1515
from CIME.case import Case

‎cime_config/buildnml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import os, sys, glob
1414
CIMEROOT = os.environ.get("CIMEROOT")
1515
if CIMEROOT is None:
1616
raise SystemExit("ERROR: must set CIMEROOT environment variable")
17-
sys.path.append(os.path.join(CIMEROOT, "scripts", "Tools"))
17+
sys.path.append(os.path.join(CIMEROOT, "CIME", "Tools"))
1818

1919
from standard_script_setup import *
2020
from CIME.case import Case

‎cime_config/testdefs/testlist_rtm.xml‎

Lines changed: 56 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,117 @@
11
<?xml version="1.0"?>
22
<testlist version="2.0">
33

4-
<test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
4+
<test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm45Sp" testmods="rtm/default">
55
<machines>
6-
<machine name="cheyenne" compiler="intel" category="rtm"></machine>
7-
<machine name="cheyenne" compiler="gnu" category="rtm"></machine>
8-
<machine name="izumi" compiler="nag" category="rtm"></machine>
6+
<machine name="derecho" compiler="intel" category="rtm"></machine>
97
</machines>
108
<options>
119
<option name="wallclock">00:20:00</option>
12-
<option name="comment" >Restart test without DEBUG on all machines/compilers</option>
10+
<option name="comment" >Restart test with DEBUG on</option>
1311
</options>
1412
</test>
15-
<test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
13+
<test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50SpRtmFl" testmods="rtm/default">
1614
<machines>
17-
<machine name="cheyenne" compiler="intel" category="rtm"></machine>
18-
<machine name="cheyenne" compiler="gnu" category="rtm"></machine>
19-
<machine name="izumi" compiler="nag" category="rtm"></machine>
15+
<machine name="derecho" compiler="intel" category="rtm"></machine>
16+
</machines>
17+
<options>
18+
<option name="wallclock">00:20:00</option>
19+
<option name="comment" >Restart test with DEBUG on</option>
20+
</options>
21+
</test>
22+
<test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/default">
23+
<machines>
24+
<machine name="derecho" compiler="intel" category="rtm"></machine>
25+
<machine name="derecho" compiler="gnu" category="rtm"></machine>
26+
</machines>
27+
<options>
28+
<option name="wallclock">00:20:00</option>
29+
<option name="comment" >Restart test without DEBUG on all machines/compilers (except nag because of a CTSM issue)</option>
30+
</options>
31+
</test>
32+
<test name="SMS_D_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/default">
33+
<machines>
34+
<machine name="derecho" compiler="intel" category="rtm"></machine>
35+
<machine name="derecho" compiler="gnu" category="rtm"></machine>
2036
</machines>
2137
<options>
2238
<option name="wallclock">00:20:00</option>
2339
<option name="comment" >Run with DEBUG compiler option all machine/compilers</option>
2440
</options>
2541
</test>
26-
<test name="SMS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmColdStart">
42+
<test name="SMS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmColdStart">
2743
<machines>
28-
<machine name="cheyenne" compiler="intel" category="rtm"></machine>
29-
<machine name="cheyenne" compiler="gnu" category="rtm"></machine>
30-
<machine name="izumi" compiler="nag" category="rtm"></machine>
44+
<machine name="derecho" compiler="intel" category="rtm"></machine>
45+
<machine name="derecho" compiler="gnu" category="rtm"></machine>
3146
</machines>
3247
<options>
3348
<option name="wallclock">00:20:00</option>
34-
<option name="comment" >Run a Cold-Start with all machine/compilers</option>
49+
<option name="comment" >Run a Cold-Start with main machine all compilers</option>
3550
</options>
3651
</test>
37-
<test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnIceOff">
52+
<test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnIceOff">
3853
<machines>
39-
<machine name="cheyenne" compiler="intel" category="rtm">
54+
<machine name="derecho" compiler="intel" category="rtm">
4055
<options>
4156
<option name="wallclock">00:20:00</option>
4257
</options>
4358
</machine>
4459
</machines>
60+
<options>
61+
<option name="wallclock">00:20:00</option>
62+
<option name="comment" >Run with ice off</option>
63+
</options>
4564
</test>
46-
<test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOn">
65+
<test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
4766
<machines>
48-
<machine name="cheyenne" compiler="intel" category="rtm">
67+
<machine name="derecho" compiler="intel" category="rtm">
4968
<options>
5069
<option name="wallclock">00:20:00</option>
5170
</options>
5271
</machine>
5372
</machines>
73+
<options>
74+
<option name="wallclock">00:20:00</option>
75+
<option name="comment" >Run with flooding on and effective velocity on</option>
76+
</options>
5477
</test>
55-
<test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOn">
78+
<test name="ERS_D_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOn">
5679
<machines>
57-
<machine name="cheyenne" compiler="intel" category="rtm">
80+
<machine name="derecho" compiler="intel" category="rtm">
5881
<options>
5982
<option name="wallclock">00:20:00</option>
6083
</options>
6184
</machine>
6285
</machines>
86+
<options>
87+
<option name="wallclock">00:20:00</option>
88+
<option name="comment" >Run with flooding on and effective velocity on, DEBUG on, all machines/compilers</option>
89+
</options>
6390
</test>
64-
<test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOff">
91+
<test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOnFloodOnEffvelOff">
6592
<machines>
66-
<machine name="cheyenne" compiler="intel" category="rtm">
93+
<machine name="derecho" compiler="intel" category="rtm">
6794
<options>
6895
<option name="wallclock">00:20:00</option>
6996
</options>
7097
</machine>
7198
</machines>
99+
<options>
100+
<option name="wallclock">00:20:00</option>
101+
<option name="comment" >Run with flooding on and effective velocity off</option>
102+
</options>
72103
</test>
73-
<test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOff">
104+
<test name="ERS_Ld5" grid="f09_f09_mg17" compset="I1850Clm60SpNoAnthro" testmods="rtm/rtmOff">
74105
<machines>
75-
<machine name="cheyenne" compiler="intel" category="rtm">
106+
<machine name="derecho" compiler="intel" category="rtm">
76107
<options>
77108
<option name="wallclock">00:20:00</option>
78109
</options>
79110
</machine>
80111
</machines>
81-
</test>
82-
<test name="SMS_D_Ld5_Vmct" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
83-
<machines>
84-
<machine name="cheyenne" compiler="intel" category="rtm"></machine>
85-
</machines>
86112
<options>
87113
<option name="wallclock">00:20:00</option>
88-
<option name="comment" >Run with DEBUG compiler option with the MCT driver/option</option>
114+
<option name="comment" >Run for RTM off</option>
89115
</options>
90116
</test>
91117

‎docs/ChangeLog‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
===============================================================
2+
Tag name: rtm1_0_80
3+
Originator(s): swensosc
4+
Date: Jun 21, 2024
5+
One-line Summary: fix area scaling to correct RTM river flux to MOM6
6+
7+
Fix how area is applied to input runoff for rtm
8+
9+
Resolves #50
10+
11+
Pull Requests:
12+
13+
#51
14+
15+
===============================================================
16+
Tag name: rtm1_0_79
17+
Originator(s): mvertens/erik
18+
Date: Jan 27, 2024
19+
One-line Summary: Remove MCT from RTM
20+
21+
This tag removes MCT code that is no longer used since it is only in the mct cap.
22+
Also updates the testlist to be moved to Derecho, removing izumi
23+
24+
Erik added some changes to this that were important for RTM as a maintainer of
25+
RTM which cover the following issues:
26+
27+
Resolves #45 -- failing tests
28+
Resolves #44 -- lower testing for RTM (remove Izumi tests)
29+
Resolves #41 -- Move testlist from Cheyenne to Derecho
30+
Resolves #33 -- Update path to CIME tools needed for buildnml/buildlib
31+
32+
Pull Requests:
33+
34+
#42 -- Remove MCT
35+
#40 -- Update README and test comments
36+
137
===============================================================
238
Tag name: rtm1_0_78
339
Originator(s): erik

0 commit comments

Comments
 (0)