Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/auxcimebaselines' into importfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ekluzek committed Feb 23, 2018
2 parents 4b24b08 + fe04dfe commit 3144919
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions cime_config/testdefs/testlist_clm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@
<test name="ERP_D_Ld10" grid="f10_f10_musgs" compset="IHistClm50BgcCrop" testmods="clm/ciso_decStart">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
<machine name="cheyenne" compiler="intel" category="aux_cime_baselines"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand Down Expand Up @@ -629,6 +630,7 @@
<test name="ERP_P36x2_D_Ld5" grid="f10_f10_musgs" compset="I2000Clm45Sp" testmods="clm/default">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
<machine name="cheyenne" compiler="intel" category="aux_cime_baselines"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand Down Expand Up @@ -1243,6 +1245,7 @@
<machine name="cheyenne" compiler="intel" category="clm_short"/>
<machine name="cheyenne" compiler="gnu" category="aux_clm"/>
<machine name="cheyenne" compiler="gnu" category="clm_short"/>
<machine name="cheyenne" compiler="intel" category="aux_cime_baselines"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand Down Expand Up @@ -1815,6 +1818,7 @@
<test name="ERP_Ld9" grid="f45_f45" compset="I2000Clm45Fates" testmods="clm/FatesAllVars">
<machines>
<machine name="cheyenne" compiler="intel" category="fates"/>
<machine name="edison" compiler="intel" category="fates"/>
<machine name="hobart" compiler="nag" category="fates"/>
</machines>
<options>
Expand All @@ -1824,6 +1828,7 @@
<test name="ERS_D_Ld3" grid="f19_g16" compset="I2000Clm50FatesCruGs" testmods="clm/Fates">
<machines>
<machine name="cheyenne" compiler="intel" category="fates"/>
<machine name="edison" compiler="intel" category="fates"/>
<machine name="cheyenne" compiler="gnu" category="fates"/>
</machines>
<options>
Expand All @@ -1849,6 +1854,7 @@
<test name="ERS_D_Mmpi-serial_Ld5" grid="1x1_brazil" compset="I2000Clm50FatesCruGs" testmods="clm/Fates">
<machines>
<machine name="cheyenne" compiler="intel" category="fates"/>
<machine name="edison" compiler="intel" category="fates"/>
<machine name="hobart" compiler="nag" category="fates"/>
</machines>
<options>
Expand All @@ -1866,6 +1872,7 @@
<test name="ERS_Ld60" grid="f45_f45" compset="I2000Clm45Fates" testmods="clm/Fates">
<machines>
<machine name="cheyenne" compiler="intel" category="fates"/>
<machine name="edison" compiler="intel" category="fates"/>
<machine name="cheyenne" compiler="gnu" category="fates"/>
<machine name="hobart" compiler="nag" category="fates"/>
</machines>
Expand Down

0 comments on commit 3144919

Please sign in to comment.