Skip to content

Commit e2add54

Browse files
ekluzekekluzek
committed
Merge remote-tracking branch 'escomp/master'
2 parents f02184e + 626bf29 commit e2add54

12 files changed

Lines changed: 194 additions & 884 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ CMakeFiles/
2525
core.*
2626
*.gz
2727
*.log
28+
cime_config/buildnmlc
2829

2930
# test and case directories
3031
tests/

‎cime_config/config_archive.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<components version="2.0">
2+
3+
<comp_archive_spec compname="mosart" compclass="rof">
4+
<rest_file_extension>r</rest_file_extension>
5+
<rest_file_extension>rh\d*</rest_file_extension>
6+
<hist_file_extension>h\d*.*\.nc$</hist_file_extension>
7+
<rest_history_varname>locfnh</rest_history_varname>
8+
<rpointer>
9+
<rpointer_file>rpointer.rof$NINST_STRING</rpointer_file>
10+
<rpointer_content>$CASE.mosart$NINST_STRING.r.$DATENAME.nc</rpointer_content>
11+
</rpointer>
12+
<test_file_names>
13+
<tfile disposition="copy">rpointer.rof</tfile>
14+
<tfile disposition="copy">rpointer.rof_9999</tfile>
15+
<tfile disposition="copy">casename.mosart.r.1976-01-01-00000.nc</tfile>
16+
<tfile disposition="copy">casename.mosart.rh4.1976-01-01-00000.nc</tfile>
17+
<tfile disposition="move">casename.mosart.h0.1976-01-01-00000.nc</tfile>
18+
<tfile disposition="ignore">casename.mosart.h0.1976-01-01-00000.nc.base</tfile>
19+
</test_file_names>
20+
</comp_archive_spec>
21+
22+
</components>

‎cime_config/testdefs/testlist_mosart.xml‎

Lines changed: 57 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,59 @@
11
<?xml version="1.0"?>
2-
<testlist>
3-
<compset name="I2000Clm50BgcCru">
4-
<grid name="f10_f10">
5-
<test name="ERS_Ld5">
6-
<machine compiler="gnu" testtype="mosart" testmods="mosart/default">yellowstone</machine>
7-
<machine compiler="intel" testtype="mosart" testmods="mosart/default">yellowstone</machine>
8-
<machine compiler="intel" testtype="mosart" testmods="mosart/iceOff">yellowstone</machine>
9-
<machine compiler="intel" testtype="mosart" testmods="mosart/mosartOff">yellowstone</machine>
10-
<machine compiler="pgi" testtype="mosart" testmods="mosart/default">yellowstone</machine>
11-
</test>
12-
<test name="SMS_D_Ld5">
13-
<machine compiler="gnu" testtype="mosart" testmods="mosart/default">yellowstone</machine>
14-
<machine compiler="intel" testtype="mosart" testmods="mosart/default">yellowstone</machine>
15-
<machine compiler="pgi" testtype="mosart" testmods="mosart/default">yellowstone</machine>
16-
</test>
17-
</grid>
18-
</compset>
2+
<testlist version="2.0">
3+
4+
<test name="ERS_Ld5" grid="f10_f10_musgs" compset="I2000Clm50BgcCru" testmods="mosart/default">
5+
<machines>
6+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
7+
<machine name="cheyenne" compiler="gnu" category="mosart"></machine>
8+
<machine name="hobart" compiler="nag" category="mosart"></machine>
9+
</machines>
10+
<options>
11+
<option name="wallclock">0:20</option>
12+
<option name="comment" >Restart test without DEBUG on all machines/compilers</option>
13+
</options>
14+
</test>
15+
<test name="ERS_Ld5" grid="f10_f10_musgs" compset="I2000Clm50BgcCru" testmods="mosart/iceOff">
16+
<machines>
17+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
18+
</machines>
19+
<options>
20+
<option name="wallclock">0:20</option>
21+
</options>
22+
</test>
23+
<test name="ERS_Ld5" grid="f10_f10_musgs" compset="I2000Clm50BgcCru" testmods="mosart/mosartOff">
24+
<machines>
25+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
26+
</machines>
27+
<options>
28+
<option name="wallclock">0:20</option>
29+
</options>
30+
</test>
31+
<test name="SMS_D_Ld5" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/default">
32+
<machines>
33+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
34+
<machine name="cheyenne" compiler="gnu" category="mosart"></machine>
35+
<machine name="hobart" compiler="nag" category="mosart"></machine>
36+
</machines>
37+
<options>
38+
<option name="wallclock">0:20</option>
39+
<option name="comment" >Smoke test with DEBUG on all machines/compilers</option>
40+
</options>
41+
</test>
42+
<test name="SMS_D" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/decompOpts">
43+
<machines>
44+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
45+
</machines>
46+
<options>
47+
<option name="wallclock">0:20</option>
48+
<option name="comment" >decompOpts are not bit for bit on PE layout change</option>
49+
</options>
50+
</test>
51+
<test name="ERP_D" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/qgrwlOpts">
52+
<machines>
53+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
54+
</machines>
55+
<options>
56+
<option name="wallclock">0:20</option>
57+
</options>
58+
</test>
1959
</testlist>

‎cime_config/testdefs/testmods_dirs/mosart/decompOpts/user_nl_mosart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
smat_option = 'opt'
2+
decomp_option = '1d'

‎cime_config/testdefs/testmods_dirs/mosart/qgrwlOpts/user_nl_mosart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
qgwl_runoff_option = 'all'
2+
bypass_routing_option = 'direct_to_outlet'

doc/ChangeLog renamed to docs/ChangeLog

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
===============================================================
2+
Tag name: mosart1_0_30
3+
Originator(s): erik
4+
Date: Jan 24, 2018
5+
One-line Summary: Fix testlist so options are under test not machines
6+
7+
Fix testlist so options are under <test> rather than <machines>.
8+
Also remove aux_clm category (any of those tests should be in CLM's testlist).
9+
10+
M cime_config/testdefs/testlist_mosart.xml
11+
12+
===============================================================
13+
Tag name: mosart1_0_29
14+
Originator(s): erik
15+
Date: Jan 17, 2018
16+
One-line Summary: Update testlist to version 2 format, remove ys tests
17+
18+
Add buildnmlc to .gitignore
19+
20+
Convert the test list to version 2 format, add comments and wallclock to it.
21+
Remove ys tests. Remove aux_clm tests (put those in CLM itself). Add
22+
two more test mods for currently untested options.
23+
24+
M cime_config/testdefs/testlist_mosart.xml
25+
A cime_config/testdefs/testmods_dirs/mosart/decompOpts/user_nl_mosart
26+
A cime_config/testdefs/testmods_dirs/mosart/qgrwlOpts/user_nl_mosart
27+
128
===============================================================
229
Tag name: mosart1_0_28
330
Originator(s): erik

‎docs/index.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<head>
2+
<title>MOSART</title>
3+
<META http-equiv="refresh" content="5;http://www.cesm.ucar.edu/models/cesm2.0/river/">
4+
</head>
5+
<body>
6+
<P>If your browser supports Refresh, you'll be transported to the
7+
<a href="http://www.cesm.ucar.edu/models/cesm2.0/river/">CESM Website</a>
8+
in 5 seconds, otherwise, select the link manually.
9+
</body>

0 commit comments

Comments
 (0)