Skip to content

Commit 6688e13

Browse files
ekluzekekluzek
authored
Merge pull request #4 from ekluzek/testlistv2woys
Convert testlist to version 2 format, add wallclock/comments, remove yellowstone
2 parents 9a32aed + ffdbd84 commit 6688e13

4 files changed

Lines changed: 83 additions & 17 deletions

File tree

‎cime_config/testdefs/testlist_mosart.xml‎

Lines changed: 63 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,65 @@
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="cheyenne" compiler="intel" category="aux_clm"></machine>
9+
<machine name="cheyenne" compiler="gnu" category="aux_clm"></machine>
10+
<machine name="hobart" compiler="nag" category="mosart"></machine>
11+
<options>
12+
<option name="wallclock">0:20</option>
13+
<option name="comment" >Restart test without DEBUG on all machines/compilers</option>
14+
</options>
15+
</machines>
16+
</test>
17+
<test name="ERS_Ld5" grid="f10_f10_musgs" compset="I2000Clm50BgcCru" testmods="mosart/iceOff">
18+
<machines>
19+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
20+
<machine name="cheyenne" compiler="intel" category="aux_clm"></machine>
21+
<options>
22+
<option name="wallclock">0:20</option>
23+
</options>
24+
</machines>
25+
</test>
26+
<test name="ERS_Ld5" grid="f10_f10_musgs" compset="I2000Clm50BgcCru" testmods="mosart/mosartOff">
27+
<machines>
28+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
29+
<machine name="cheyenne" compiler="intel" category="aux_clm"></machine>
30+
<options>
31+
<option name="wallclock">0:20</option>
32+
</options>
33+
</machines>
34+
</test>
35+
<test name="SMS_D_Ld5" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/default">
36+
<machines>
37+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
38+
<machine name="cheyenne" compiler="gnu" category="mosart"></machine>
39+
<machine name="hobart" compiler="nag" category="mosart"></machine>
40+
<machine name="cheyenne" compiler="intel" category="aux_clm"></machine>
41+
<machine name="cheyenne" compiler="gnu" category="aux_clm"></machine>
42+
<options>
43+
<option name="wallclock">0:20</option>
44+
<option name="comment" >Smoke test with DEBUG on all machines/compilers</option>
45+
</options>
46+
</machines>
47+
</test>
48+
<test name="SMS_D" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/decompOpts">
49+
<machines>
50+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
51+
<options>
52+
<option name="wallclock">0:20</option>
53+
<option name="comment" >decompOpts are not bit for bit on PE layout change</option>
54+
</options>
55+
</machines>
56+
</test>
57+
<test name="ERP_D" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/qgrwlOpts">
58+
<machines>
59+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
60+
<options>
61+
<option name="wallclock">0:20</option>
62+
</options>
63+
</machines>
64+
</test>
1965
</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‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
===============================================================
2+
Tag name: mosart1_0_29
3+
Originator(s): erik
4+
Date: Jan 17, 2017
5+
One-line Summary: Update testlist to version 2 format, remove ys tests
6+
7+
Add buildnmlc to .gitignore
8+
9+
Convert the test list to version 2 format, add comments and wallclock to it.
10+
Remove ys tests. Remove aux_clm tests (put those in CLM itself). Add
11+
two more test mods for currently untested options.
12+
13+
M cime_config/testdefs/testlist_mosart.xml
14+
A cime_config/testdefs/testmods_dirs/mosart/decompOpts/user_nl_mosart
15+
A cime_config/testdefs/testmods_dirs/mosart/qgrwlOpts/user_nl_mosart
16+
117
===============================================================
218
Tag name: mosart1_0_28
319
Originator(s): erik

0 commit comments

Comments
 (0)