Skip to content

Commit

Permalink
Remove month length from ER tests fixing ESCOMP#2871
Browse files Browse the repository at this point in the history
  • Loading branch information
@ekluzek
ekluzek committed Nov 18, 2024
1 parent 2a6348f commit 6c87b4e
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions cime_config/testdefs/testlist_clm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@
<option name="comment" >Run soil matrix solution without CN matrix with debug on and the extra options that it interacts with (isotopes and crop)</option>
</options>
</test>
<test name="ERS_Lm13" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/monthly_matrixcn_fast_spinup">
<test name="ERS_Ld396" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/monthly_matrixcn_fast_spinup">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="izumi" compiler="intel" category="aux_clm"/>
Expand Down Expand Up @@ -893,7 +893,7 @@
<option name="comment" >Run in DEBUG with the matrix solution on for spinup with all options it interacts with (requires Bgc, but also turn on Crop and Carbon isotopes)</option>
</options>
</test>
<test name="ERS_Lm54_Mmpi-serial" grid="1x1_numaIA" compset="I2000Clm50BgcCrop" testmods="clm/ciso_monthly_matrixcn_spinup">
<test name="ERS_Ly4_Mmpi-serial" grid="1x1_numaIA" compset="I2000Clm50BgcCrop" testmods="clm/ciso_monthly_matrixcn_spinup">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="matrixcn"/>
Expand All @@ -903,7 +903,7 @@
<option name="comment" >Run without DEBUG for a long period for a single-point case with the matrix solution on for spinup with all options it interacts with (requires Bgc, but also turn on Crop and Carbon isotopes)</option>
</options>
</test>
<test name="LCISO_Lm13" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/ciso_monthly_matrixcn_spinup">
<test name="LCISO_Ld396" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/ciso_monthly_matrixcn_spinup">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="matrixcn"/>
Expand Down Expand Up @@ -1434,7 +1434,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERP_P64x2_Lm13" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/monthly">
<test name="ERP_P64x2_Ld396" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/monthly">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="gnu" category="aux_clm"/>
Expand All @@ -1444,26 +1444,26 @@
<option name="tput_tolerance">0.5</option>
</options>
</test>
<test name="ERP_P64x2_Lm13" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/monthly--clm/matrixcnOn_ignore_warnings">
<test name="ERP_P64x2_Ld396" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/monthly--clm/matrixcnOn_ignore_warnings">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="matrixcn"/>
</machines>
<options>
<option name="wallclock">02:00:00</option>
<option name="tput_tolerance">0.5</option>
<option name="comment" >Repeat ERP_P64x2_Lm13...monthly test with matrixcnOn</option>
<option name="comment" >Repeat ERP_P64x2_Ld396...13 month test with matrixcnOn</option>
</options>
</test>
<test name="REP_P64x2_Lm13" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/monthly--clm/matrixcnOn_ignore_warnings">
<test name="REP_P64x2_Ld396" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/monthly--clm/matrixcnOn_ignore_warnings">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="matrixcn"/>
</machines>
<options>
<option name="wallclock">02:00:00</option>
<option name="tput_tolerance">0.5</option>
<option name="comment">Repeat ERP_P64x2_Lm13...monthly test with matrixcnOn as REP test because both tests fail as reported in #2619</option>
<option name="comment">Repeat ERP_P64x2_Ld396...13 month test with matrixcnOn as REP test because both tests fail as reported in #2619</option>
</options>
</test>
<test name="REP_P64x2_Ld13" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/monthly--clm/matrixcnOn_ignore_warnings">
Expand All @@ -1474,7 +1474,7 @@
<options>
<option name="wallclock">02:00:00</option>
<option name="tput_tolerance">0.5</option>
<option name="comment">Repeat REP_P64x2_Lm13...monthly test with matrixcnOn as shorter REP_P64x2_Ld13 because the longer one fails as reported in issue #2619</option>
<option name="comment">Repeat REP_P64x2_Ld396...13 month test with matrixcnOn as shorter REP_P64x2_Ld13 because the longer one fails as reported in issue #2619</option>
</options>
</test>
<test name="ERP_P64x2_D" grid="f10_f10_mg37" compset="I2000Clm50SpRtmFl" testmods="clm/default">
Expand Down Expand Up @@ -1515,13 +1515,13 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERP_P64x2_Lm25" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/monthly">
<test name="ERP_P64x2_Ly36" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/monthly">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">01:40:00</option>
<option name="comment" >threaded ERP test for crop just over 2-years</option>
<option name="comment" >threaded ERP test for crop for 3-years</option>
</options>
</test>
<test name="ERP_P64x2_D_Ld5" grid="f10_f10_mg37" compset="I1850Clm45BgcCrop" testmods="clm/crop">
Expand Down Expand Up @@ -1551,7 +1551,7 @@
<option name="comment" >Want a multi-year global crop restart test; this was 5 years when we were doing cold start, but 3 years is probably sufficient given that we have spun-up crop initial conditions</option>
</options>
</test>
<test name="ERP_P64x2_Lm36" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/clm50cropIrrigMonth_interp">
<test name="ERP_P64x2_Ly3" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/clm50cropIrrigMonth_interp">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="prebeta"/>
Expand All @@ -1561,7 +1561,7 @@
<option name="comment" >Want a multi-year global crop restart test; this was 5 years when we were doing cold start, but 3 years is probably sufficient given that we have spun-up crop initial conditions</option>
</options>
</test>
<test name="ERP_P64x2_Lm7" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_alternate_monthly">
<test name="ERP_P64x2_Ly1" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_alternate_monthly">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm">
<options>
Expand Down Expand Up @@ -1697,7 +1697,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERS_Lm20_Mmpi-serial" grid="1x1_smallvilleIA" compset="I1850Clm50BgcCrop" testmods="clm/cropMonthlyNoinitial">
<test name="ERS_Ld600_Mmpi-serial" grid="1x1_smallvilleIA" compset="I1850Clm50BgcCrop" testmods="clm/cropMonthlyNoinitial">
<machines>
<machine name="izumi" compiler="gnu" category="aux_clm"/>
</machines>
Expand Down Expand Up @@ -1725,7 +1725,7 @@
<option name="comment" >Repeat ERS_Ly5_Mmpi-serial...ciso_monthly test with matrixcnOn</option>
</options>
</test>
<test name="ERS_Lm40_Mmpi-serial" grid="1x1_numaIA" compset="I2000Clm50BgcCropQianRs" testmods="clm/cropMonthlyNoinitial">
<test name="ERS_Ld1200_Mmpi-serial" grid="1x1_numaIA" compset="I2000Clm50BgcCropQianRs" testmods="clm/cropMonthlyNoinitial">
<machines>
<machine name="izumi" compiler="gnu" category="aux_clm"/>
</machines>
Expand All @@ -1734,7 +1734,7 @@
<option name="comment" >tests mid-year restart, with the restart file being written in the middle of the second year after cold start initialization (to test crop restarts at different points throughout the first few years after cold start)</option>
</options>
</test>
<test name="ERS_Lm54_Mmpi-serial" grid="1x1_numaIA" compset="I2000Clm50BgcCropQianRs" testmods="clm/cropMonthlyNoinitial">
<test name="ERS_Ld1600_Mmpi-serial" grid="1x1_numaIA" compset="I2000Clm50BgcCropQianRs" testmods="clm/cropMonthlyNoinitial">
<machines>
<machine name="izumi" compiler="intel" category="aux_clm"/>
</machines>
Expand Down Expand Up @@ -1926,7 +1926,7 @@
<option name="comment" >Include one LVG debug test (exact configuration is not very important). Note that the LVG test will fail if there is any 1-d output, or output separated by glacier elevation classes (e.g., the various *_FORC fields), so this includes a testmod that turns off any 1-d output.</option>
</options>
</test>
<test name="LCISO_Lm13" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/ciso_monthly">
<test name="LCISO_Ld396" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/ciso_monthly">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="prebeta"/>
Expand All @@ -1936,15 +1936,15 @@
<option name="comment" >Make sure Carbon isotopes on and off with land-use change, does NOT change answers. To verify for landuse change must go beyond a year boundary, because of #404 we can't use a December start, so need to run for beyond the year boundary.</option>
</options>
</test>
<test name="LCISO_Lm13" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/ciso_monthly--clm/matrixcnOn_ignore_warnings">
<test name="LCISO_Ld396" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/ciso_monthly--clm/matrixcnOn_ignore_warnings">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="prebeta"/>
<machine name="derecho" compiler="intel" category="matrixcn"/>
</machines>
<options>
<option name="wallclock">01:30:00</option>
<option name="comment" >Repeat LCISO_Lm13...ciso_monthly test with matrixcnOn</option>
<option name="comment" >Repeat LCISO_Ld397...ciso_monthly test with matrixcnOn</option>
</options>
</test>
<test name="NCK_Ld1" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/default">
Expand Down Expand Up @@ -2400,7 +2400,7 @@
</options>
</test>

<test name="ERS_P128x1_Lm25" grid="f10_f10_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdNoComp">
<test name="ERS_P128x1_Ly2" grid="f10_f10_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdNoComp">
<machines>
<!-- no izumi tests since this has a pe layout specific for derecho -->
<machine name="derecho" compiler="intel" category="aux_clm"/>
Expand Down Expand Up @@ -2466,7 +2466,7 @@
<option name="comment" >Want a debug test that tests a number of aspects of transient crops, including a new crop landunit and shifting PCT_CFT; move to CLM50 once we can get it fast enough (see bug 2391)</option>
</options>
</test>
<test name="ERS_Lm25" grid="1x1_smallvilleIA" compset="IHistClm50BgcCropQianRs" testmods="clm/smallville_dynlakes_monthly">
<test name="ERS_Ly36" grid="1x1_smallvilleIA" compset="IHistClm50BgcCropQianRs" testmods="clm/smallville_dynlakes_monthly">
<machines>
<machine name="derecho" compiler="gnu" category="aux_clm"/>
</machines>
Expand All @@ -2475,7 +2475,7 @@
<option name="comment">Include a test of transient lakes</option>
</options>
</test>
<test name="ERS_Lm25" grid="1x1_smallvilleIA" compset="IHistClm50BgcCropQianRs" testmods="clm/smallville_dynurban_monthly">
<test name="ERS_Ly36" grid="1x1_smallvilleIA" compset="IHistClm50BgcCropQianRs" testmods="clm/smallville_dynurban_monthly">
<machines>
<machine name="derecho" compiler="gnu" category="aux_clm"/>
</machines>
Expand Down Expand Up @@ -2619,7 +2619,7 @@
<option name="comment">Repeat nlevgrnd_small test with matrixcnOn</option>
</options>
</test>
<test name="SMS_Lm13_PS" grid="f19_g17" compset="I2000Clm60BgcCrop" testmods="clm/cropMonthOutput">
<test name="SMS_Ly2_PS" grid="f19_g17" compset="I2000Clm60BgcCrop" testmods="clm/cropMonthOutput">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
</machines>
Expand All @@ -2628,7 +2628,7 @@
<option name="comment" >include a relatively long crop test at relatively high resolution</option>
</options>
</test>
<test name="SMS_Lm37" grid="f10_f10_mg37" compset="I1850Clm50SpG" testmods="clm/glcMEC_long--clm/nofireemis">
<test name="SMS_Ly3" grid="f10_f10_mg37" compset="I1850Clm50SpG" testmods="clm/glcMEC_long--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="prebeta"/>
Expand Down Expand Up @@ -2794,15 +2794,15 @@
<option name="wallclock">00:40:00</option>
</options>
</test>
<test name="ERS_Lm13" grid="f10_f10_mg37" compset="I2000Clm50Fates" testmods="clm/FatesCold">
<test name="ERS_Ld396" grid="f10_f10_mg37" compset="I2000Clm50Fates" testmods="clm/FatesCold">
<machines>
<machine name="derecho" compiler="gnu" category="fates"/>
</machines>
<options>
<option name="wallclock">00:50:00</option>
</options>
</test>
<test name="ERS_Lm13" grid="f45_f45_mg37" compset="I2000Clm50Fates" testmods="clm/FatesColdNoComp">
<test name="ERS_Ld396" grid="f45_f45_mg37" compset="I2000Clm50Fates" testmods="clm/FatesColdNoComp">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
</machines>
Expand Down

0 comments on commit 6c87b4e

Please sign in to comment.