Skip to content

Commit

Permalink
Merge pull request #1 from bandre-ucar/andre-ed-testlist
Browse files Browse the repository at this point in the history
Create ED test suite for cime test driver
  • Loading branch information
rgknox committed Jan 7, 2016
2 parents 5dd2f23 + 017039b commit 3a8f2d8
Showing 1 changed file with 56 additions and 28 deletions.
84 changes: 56 additions & 28 deletions components/clm/cimetest/testlist_clm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@
</grid>
<grid name="f09_g16">
<test name="ERI_D_Ld9">
<machine compiler="ed" testtype="ed" testmods="clm/default">ed</machine>
<machine compiler="intel" testtype="aux_clm_ys_pgi" testmods="clm/default">edison</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
Expand All @@ -498,30 +499,6 @@
</test>
</grid>
<grid name="f10_f10">
<test name="SMS_D_Ld3">
<machine compiler="intel" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="gnu" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="gnu" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
</test>
<test name="ERS_D_Ld3">
<machine compiler="intel" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="gnu" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="gnu" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
</test>
<test name="ERP_D_Ld3_P15x2">
<machine compiler="intel" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="gnu" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="gnu" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
</test>
<test name="CME_Ld1">
<machine compiler="intel" testtype="aux_testsystem" testmods="clm/default">yellowstone</machine>
</test>
Expand All @@ -539,6 +516,14 @@
<machine compiler="intel" testtype="aux_clm45" testmods="clm/drydepnomegan">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45">yellowstone</machine>
</test>
<test name="ERP_D_Ld3_P15x2">
<machine compiler="gnu" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="gnu" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
</test>
<test name="ERP_D_Ld5">
<machine compiler="intel" testtype="aux_clm_ys_intel" testmods="clm/rootlit">edison</machine>
<machine compiler="nag" testtype="prebeta" testmods="clm/reduceOutput">goldbach</machine>
Expand All @@ -558,12 +543,29 @@
<test name="ERP_P15x2_D">
<machine compiler="gnu" testtype="aux_clm45" testmods="clm/snowlayers_12" comment="Can be removed once we change the CLM5 default to have more than 5 snow layers (at which point we will be testing 5 layers with CLM45 and more than 5 with CLM5)">yellowstone</machine>
</test>
<test name="ERS_D_Ld3">
<machine compiler="gnu" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="gnu" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
</test>
<test name="PEM_Ld1">
<machine compiler="intel" testtype="aux_testsystem" testmods="clm/default">yellowstone</machine>
</test>
<test name="SMS_D_Ld1_P24x1">
<machine compiler="nag" testtype="aux_clm45" testmods="clm/oldhyd">hobart</machine>
</test>
<test name="SMS_D_Ld3">
<machine compiler="ed" testtype="ed" testmods="clm/default">ed</machine>
<machine compiler="gnu" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
<machine compiler="gnu" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm_short" testmods="clm/default">yellowstone</machine>
</test>
<test name="SMS_Lm1_D">
<machine compiler="intel" testtype="aux_clm45" testmods="clm/snowlayers_3_monthly" comment="nlevsno less than 5 is not important scientifically, but is useful for making sure no code assumes that there are 5 snow layers (because this should result in an array bounds exception); this test can be removed once CLM5 is released and most new branches are based off of CLM5 (which will have a runtime-set number of snow layers, rather than assuming 5 snow layers)... until then, I want this test to catch any new code that assumes 5 snow layers">yellowstone</machine>
</test>
Expand Down Expand Up @@ -700,28 +702,54 @@
<compset name="ICLM45ED">
<grid name="1x1_brazil">
<test name="ERS_D_Mmpi-serial_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
<machine compiler="gnu" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
</test>
</grid>
<grid name="5x5_amazon">
<test name="ERS_D_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
</test>
<test name="SMS_D_Mmpi-serial_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
<machine compiler="nag" testtype="aux_clm45" testmods="clm/edTest">hobart</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
</test>
</grid>
<grid name="f09_g16">
<test name="ERS_D_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
</test>
</grid>
<grid name="f10_f10">
<test name="ERS_D_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
</test>
<test name="SMS_D_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
</test>
<test name="SMS_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
</test>
</grid>
<grid name="f19_g16">
<test name="ERS_D_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
</test>
<test name="SMS_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
<machine compiler="gnu" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
</test>
</grid>
<grid name="f45_g37">
<test name="ERS_D_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
</test>
</grid>
</compset>
<compset name="ICLM45GLCMEC">
<grid name="f19_g16">
Expand Down Expand Up @@ -897,10 +925,6 @@
</compset>
<compset name="ICRUCLM50BGC">
<grid name="f10_f10">
<test name="ERP_D_P15x2_Ld3">
<machine compiler="intel" testtype="aux_clm45" testmods="clm/flexibleCN">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/luna">yellowstone</machine>
</test>
<test name="ERI_D_Ld9">
<machine compiler="intel" testtype="aux_clm_ys_intel" testmods="clm/default">edison</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/default">yellowstone</machine>
Expand All @@ -915,6 +939,10 @@
<machine compiler="intel" testtype="aux_clm45" testmods="clm/reduceOutput">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/reduceOutput">yellowstone</machine>
</test>
<test name="ERP_D_P15x2_Ld3">
<machine compiler="intel" testtype="aux_clm45" testmods="clm/flexibleCN">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/luna">yellowstone</machine>
</test>
<test name="ERP_Ld5_P24x1">
<machine compiler="nag" testtype="aux_clm45" testmods="clm/reduceOutput">hobart</machine>
</test>
Expand Down

0 comments on commit 3a8f2d8

Please sign in to comment.