Skip to content

Commit

Permalink
update testlist and expected fails
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvdebolskiy
mvdebolskiy committed Mar 5, 2025
1 parent 4e11412 commit 022951f
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 60 deletions.
23 changes: 23 additions & 0 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,4 +378,27 @@
</phase>
</test>

<!--NORESM tests that fail-->

<test name="ERI_D_Ld9.f45_f45_mg37.I2000Clm60Fates.betzy_intel.clm-FatesCold">
<phase name="RUN">
<status>FAIL</status>
<issue>CTSM#2953</issue>
</phase>
</test>

<test name="SMS_D_Ld3.ne30pg3_ne30pg3_mtn14.I2000Clm60FatesSpRsGs.betzy_intel.clm-FatesColdSatPhen_prescribed">
<phase name="RUN">
<status>FAIL</status>
<issue>CTSM#2953</issue>
</phase>
</test>

<test name="ERS_D_Ld15.f45_f45_mg37.I2000Clm50FatesRs.betzy_gnu.clm-FatesColdTwoStreamNoCompFixedBioGeo">
<phase name="COMPARE_base_rest">
<status>FAIL</status>
<issue>#2325</issue>
</phase>
</test>

</expectedFails>
93 changes: 33 additions & 60 deletions cime_config/testdefs/testlist_clm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2773,6 +2773,7 @@
<test name="ERS_D_Ld15" grid="f45_f45_mg37" compset="I2000Clm50FatesRs" testmods="clm/FatesColdTwoStreamNoCompFixedBioGeo">
<machines>
<machine name="derecho" compiler="gnu" category="fates"/>
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:30:00</option>
Expand Down Expand Up @@ -3271,7 +3272,7 @@
<option name="comment">Test with DEBUG on for FatesSP mode, NOTE: FatesSp has the largest difference in CTSM code for any FATES mode</option>
</options>
</test>
<test name="SMS_D" grid="1x1_brazil" compset="I2000Clm60FatesSpCruRsGs" testmods="clm/FatesColdDryDepSatPhen">
<test name="ERS_D" grid="1x1_brazil" compset="I2000Clm60FatesSpCruRsGs" testmods="clm/FatesColdDryDepSatPhen">
<machines>
<machine name="derecho" compiler="gnu" category="aux_clm"/>
</machines>
Expand Down Expand Up @@ -3797,16 +3798,16 @@

<!-- FATES-SP -->

<test name="SMS" grid="ne30pg3_ne30pg3_mtn14" compset="2000_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesColdSatPhen">
<test name="SMS_D" grid="ne30pg3_ne30pg3_mtn14" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdSatPhen">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:30:00</option>
<option name="comment">Simple test to make sure the basic Fates-SP compset works</option>
</options>
</test>
<test name="ERP_Ld30" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesColdSatPhen">
<test name="ERP_Ld30" grid="f45_f45_mg37" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdSatPhen">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -3815,7 +3816,7 @@
<option name="comment">""</option>
</options>
</test>
<test name="SMS_D" grid="ne30pg3_ne30pg3_mtn14" compset="2000_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesColdDryDepSatPhen">
<test name="SMS_D" grid="ne30pg3_ne30pg3_mtn14" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdDryDepSatPhen">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -3824,7 +3825,7 @@
<option name="comment">""</option>
</options>
</test>
<test name="SMS_D_Ld3" grid="ne30pg3_ne30pg3_mtn14" compset="2000_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm-FatesColdSatPhen_prescribed">
<test name="SMS_D_Ld3" grid="ne30pg3_ne30pg3_mtn14" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdSatPhen_prescribed">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -3836,37 +3837,28 @@

<!-- FATES-NOCOMP -->

<test name="ERS_Ld761" grid="ne30pg3_ne30pg3_mtn14" compset="2000_DATM%GSWP3v1_CLM60%FATES-NOCOMP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/FatesColdNoComp">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:50:00</option>
<option name="comment">""</option>
</options>
</test>
<test name="ERS_Ld761" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%FATES-NOCOMP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm-FatesColdTwoStreamNoCompFixedBioGeo">
<test name="ERS_Ld366" grid="ne30pg3_ne30pg3_mtn14" compset="I2000Clm60Fates" testmods="clm/FatesColdNoComp">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:30:00</option>
<option name="wallclock">01:50:00</option>
<option name="comment">""</option>
</options>
</test>
<test name="ERS_D_Ld15" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%FATES-NOCOMP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm-FatesColdTwoStreamNoCompFixedBioGeo">
<test name="ERS_D_Ld5" grid="1x1_brazil" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdDryDepSatPhen">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:30:00</option>
<option name="wallclock">00:32:00</option>
<option name="comment">""</option>
</options>
</test>

<!-- FATES-FULL -->

<test name="ERP_D" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesCold">
<test name="ERP_D" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesCold">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -3875,16 +3867,7 @@
<option name="comment">""</option>
</options>
</test>
<test name="SMS_D" grid="1x1_brazil" compset="2000_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesColdDryDepSatPhen">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">""</option>
</options>
</test>
<test name="ERS_D_Ld5" grid="5x5_amazon" compset="2000_DATM%GSWP3v1_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesCold">
<test name="ERS_D_Ld5" grid="5x5_amazon" compset="I2000Clm60FatesRs" testmods="clm/FatesCold">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -3896,16 +3879,16 @@

<!-- non-FATES SP tests -->

<test name="ERP_D_Ld5" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/decStart">
<test name="ERP_D_Ld16" grid="f45_f45_mg37" compset="I2000Clm60Sp" testmods="clm/midDecStart">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="wallclock">00:29:00</option>
<option name="comment">""</option>
</options>
</test>
<test name="ERP_D_Ld5" grid="f45_f45_mg37" compset="HIST_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/default">
<test name="ERP_D_Ld5" grid="f45_f45_mg37" compset="IHistClm60Sp" testmods="clm/default">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -3914,9 +3897,9 @@
<option name="comment">""</option>
</options>
</test>
<test name="ERS_D" grid="f45_f45_mg37" compset="1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/default">
<test name="ERS_D" grid="f45_f45_mg37" compset="I1850Clm60Sp" testmods="clm/default">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand All @@ -3926,7 +3909,7 @@

<!-- BGC tests -->

<test name="ERI_D_Ld9" grid="f45_f45_mg37" compset="1850_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/default">
<test name="ERI_D_Ld9" grid="f45_f45_mg37" compset="I1850Clm60Bgc" testmods="clm/default">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -3936,19 +3919,19 @@
</options>
</test>

<test name="ERP_D" grid="f45_f45_mg37" compset="HIST_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/decStart">
<test name="ERP_D_Ld10" grid="f45_f45_mg37" compset="IHistClm60Bgc" testmods="clm/midDecStart">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="wallclock">00:29:00</option>
<option name="comment">""</option>
</options>
</test>

<test name="ERP_Ld761" grid="f45_f45_mg37" compset="HIST_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/monthly">
<test name="ERP_Ld761" grid="f45_f45_mg37" compset="IHistClm60Bgc" testmods="clm/monthly">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:50:00</option>
Expand All @@ -3958,17 +3941,17 @@

<!-- BGCCrop tests -->

<test name="ERI_Ld9" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/default">
<test name="ERI_Ld9" grid="f45_f45_mg37" compset="I2000Clm60BgcCrop" testmods="clm/default">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">""</option>
</options>
</test>

<test name="ERP_D_Ld10" grid="f45_f45_mg37" compset="HIST_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/default">
<test name="ERP_D_Ld10" grid="f45_f45_mg37" compset="IHistClm60BgcCrop" testmods="clm/default">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -3978,7 +3961,7 @@
</options>
</test>

<test name="ERP_D_Ld3" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/coldStart">
<test name="ERP_D_Ld3" grid="f45_f45_mg37" compset="I2000Clm60BgcCrop" testmods="clm/coldStart">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -3988,17 +3971,7 @@
</options>
</test>

<test name="ERP_D_Ld3" grid="ne30pg3_ne30pg3_mtn14" compset="1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/mimics">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:50:00</option>
<option name="comment">""</option>
</options>
</test>

<test name="ERP_D_Ld5" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/irrig_spunup">
<test name="ERP_D_Ld5" grid="f45_f45_mg37" compset="I2000Clm60BgcCrop" testmods="clm/irrig_spunup">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -4008,7 +3981,7 @@
</options>
</test>

<test name="SMS_Ld761" grid="f19_g17" compset="2000_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/cropMonthOutput">
<test name="SMS_Ld761" grid="f19_g17" compset="I2000Clm60BgcCrop" testmods="clm/cropMonthOutput">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -4018,7 +3991,7 @@
</options>
</test>

<test name="ERP_D_Ld10" grid="f45_f45_mg37" compset="1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/ADspinup">
<test name="ERP_D_Ld10" grid="ne30pg3_ne30pg3_mtn14" compset="I1850Clm60BgcCrop" testmods="clm/ADspinup">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
Expand All @@ -4030,12 +4003,12 @@

<!-- single point non-FATES -->

<test name="ERS_D_Ld5" grid="1x1_mexicocityMEX" compset="2000_DATM%1PT_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/CLM1PTStartDate">
<test name="ERS_D_Ld5" grid="1x1_mexicocityMEX" compset="I1PtClm60SpRs" testmods="clm/CLM1PTStartDate">
<machines>
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="wallclock">00:40:00</option>
<option name="comment">""</option>
</options>
</test>
Expand Down

0 comments on commit 022951f

Please sign in to comment.