Skip to content

Commit 022951f

Browse files
mvdebolskiymvdebolskiy
committed
update testlist and expected fails
1 parent 4e11412 commit 022951f

2 files changed

Lines changed: 56 additions & 60 deletions

File tree

‎cime_config/testdefs/ExpectedTestFails.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,4 +378,27 @@
378378
</phase>
379379
</test>
380380

381+
<!--NORESM tests that fail-->
382+
383+
<test name="ERI_D_Ld9.f45_f45_mg37.I2000Clm60Fates.betzy_intel.clm-FatesCold">
384+
<phase name="RUN">
385+
<status>FAIL</status>
386+
<issue>CTSM#2953</issue>
387+
</phase>
388+
</test>
389+
390+
<test name="SMS_D_Ld3.ne30pg3_ne30pg3_mtn14.I2000Clm60FatesSpRsGs.betzy_intel.clm-FatesColdSatPhen_prescribed">
391+
<phase name="RUN">
392+
<status>FAIL</status>
393+
<issue>CTSM#2953</issue>
394+
</phase>
395+
</test>
396+
397+
<test name="ERS_D_Ld15.f45_f45_mg37.I2000Clm50FatesRs.betzy_gnu.clm-FatesColdTwoStreamNoCompFixedBioGeo">
398+
<phase name="COMPARE_base_rest">
399+
<status>FAIL</status>
400+
<issue>#2325</issue>
401+
</phase>
402+
</test>
403+
381404
</expectedFails>

‎cime_config/testdefs/testlist_clm.xml‎

Lines changed: 33 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2773,6 +2773,7 @@
27732773
<test name="ERS_D_Ld15" grid="f45_f45_mg37" compset="I2000Clm50FatesRs" testmods="clm/FatesColdTwoStreamNoCompFixedBioGeo">
27742774
<machines>
27752775
<machine name="derecho" compiler="gnu" category="fates"/>
2776+
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
27762777
</machines>
27772778
<options>
27782779
<option name="wallclock">00:30:00</option>
@@ -3271,7 +3272,7 @@
32713272
<option name="comment">Test with DEBUG on for FatesSP mode, NOTE: FatesSp has the largest difference in CTSM code for any FATES mode</option>
32723273
</options>
32733274
</test>
3274-
<test name="SMS_D" grid="1x1_brazil" compset="I2000Clm60FatesSpCruRsGs" testmods="clm/FatesColdDryDepSatPhen">
3275+
<test name="ERS_D" grid="1x1_brazil" compset="I2000Clm60FatesSpCruRsGs" testmods="clm/FatesColdDryDepSatPhen">
32753276
<machines>
32763277
<machine name="derecho" compiler="gnu" category="aux_clm"/>
32773278
</machines>
@@ -3797,16 +3798,16 @@
37973798

37983799
<!-- FATES-SP -->
37993800

3800-
<test name="SMS" grid="ne30pg3_ne30pg3_mtn14" compset="2000_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesColdSatPhen">
3801+
<test name="SMS_D" grid="ne30pg3_ne30pg3_mtn14" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdSatPhen">
38013802
<machines>
3802-
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
3803+
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
38033804
</machines>
38043805
<options>
38053806
<option name="wallclock">00:30:00</option>
38063807
<option name="comment">Simple test to make sure the basic Fates-SP compset works</option>
38073808
</options>
38083809
</test>
3809-
<test name="ERP_Ld30" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesColdSatPhen">
3810+
<test name="ERP_Ld30" grid="f45_f45_mg37" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdSatPhen">
38103811
<machines>
38113812
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
38123813
</machines>
@@ -3815,7 +3816,7 @@
38153816
<option name="comment">""</option>
38163817
</options>
38173818
</test>
3818-
<test name="SMS_D" grid="ne30pg3_ne30pg3_mtn14" compset="2000_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesColdDryDepSatPhen">
3819+
<test name="SMS_D" grid="ne30pg3_ne30pg3_mtn14" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdDryDepSatPhen">
38193820
<machines>
38203821
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
38213822
</machines>
@@ -3824,7 +3825,7 @@
38243825
<option name="comment">""</option>
38253826
</options>
38263827
</test>
3827-
<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">
3828+
<test name="SMS_D_Ld3" grid="ne30pg3_ne30pg3_mtn14" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdSatPhen_prescribed">
38283829
<machines>
38293830
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
38303831
</machines>
@@ -3836,37 +3837,28 @@
38363837

38373838
<!-- FATES-NOCOMP -->
38383839

3839-
<test name="ERS_Ld761" grid="ne30pg3_ne30pg3_mtn14" compset="2000_DATM%GSWP3v1_CLM60%FATES-NOCOMP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/FatesColdNoComp">
3840-
<machines>
3841-
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
3842-
</machines>
3843-
<options>
3844-
<option name="wallclock">00:50:00</option>
3845-
<option name="comment">""</option>
3846-
</options>
3847-
</test>
3848-
<test name="ERS_Ld761" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%FATES-NOCOMP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm-FatesColdTwoStreamNoCompFixedBioGeo">
3840+
<test name="ERS_Ld366" grid="ne30pg3_ne30pg3_mtn14" compset="I2000Clm60Fates" testmods="clm/FatesColdNoComp">
38493841
<machines>
38503842
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
38513843
</machines>
38523844
<options>
3853-
<option name="wallclock">00:30:00</option>
3845+
<option name="wallclock">01:50:00</option>
38543846
<option name="comment">""</option>
38553847
</options>
38563848
</test>
3857-
<test name="ERS_D_Ld15" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%FATES-NOCOMP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm-FatesColdTwoStreamNoCompFixedBioGeo">
3849+
<test name="ERS_D_Ld5" grid="1x1_brazil" compset="I2000Clm60FatesSpRsGs" testmods="clm/FatesColdDryDepSatPhen">
38583850
<machines>
38593851
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
38603852
</machines>
38613853
<options>
3862-
<option name="wallclock">00:30:00</option>
3854+
<option name="wallclock">00:32:00</option>
38633855
<option name="comment">""</option>
38643856
</options>
38653857
</test>
38663858

38673859
<!-- FATES-FULL -->
38683860

3869-
<test name="ERP_D" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesCold">
3861+
<test name="ERP_D" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesCold">
38703862
<machines>
38713863
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
38723864
</machines>
@@ -3875,16 +3867,7 @@
38753867
<option name="comment">""</option>
38763868
</options>
38773869
</test>
3878-
<test name="SMS_D" grid="1x1_brazil" compset="2000_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesColdDryDepSatPhen">
3879-
<machines>
3880-
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
3881-
</machines>
3882-
<options>
3883-
<option name="wallclock">00:20:00</option>
3884-
<option name="comment">""</option>
3885-
</options>
3886-
</test>
3887-
<test name="ERS_D_Ld5" grid="5x5_amazon" compset="2000_DATM%GSWP3v1_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/FatesCold">
3870+
<test name="ERS_D_Ld5" grid="5x5_amazon" compset="I2000Clm60FatesRs" testmods="clm/FatesCold">
38883871
<machines>
38893872
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
38903873
</machines>
@@ -3896,16 +3879,16 @@
38963879

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

3899-
<test name="ERP_D_Ld5" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/decStart">
3882+
<test name="ERP_D_Ld16" grid="f45_f45_mg37" compset="I2000Clm60Sp" testmods="clm/midDecStart">
39003883
<machines>
3901-
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
3884+
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
39023885
</machines>
39033886
<options>
3904-
<option name="wallclock">00:20:00</option>
3887+
<option name="wallclock">00:29:00</option>
39053888
<option name="comment">""</option>
39063889
</options>
39073890
</test>
3908-
<test name="ERP_D_Ld5" grid="f45_f45_mg37" compset="HIST_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/default">
3891+
<test name="ERP_D_Ld5" grid="f45_f45_mg37" compset="IHistClm60Sp" testmods="clm/default">
39093892
<machines>
39103893
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
39113894
</machines>
@@ -3914,9 +3897,9 @@
39143897
<option name="comment">""</option>
39153898
</options>
39163899
</test>
3917-
<test name="ERS_D" grid="f45_f45_mg37" compset="1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/default">
3900+
<test name="ERS_D" grid="f45_f45_mg37" compset="I1850Clm60Sp" testmods="clm/default">
39183901
<machines>
3919-
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
3902+
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
39203903
</machines>
39213904
<options>
39223905
<option name="wallclock">00:20:00</option>
@@ -3926,7 +3909,7 @@
39263909

39273910
<!-- BGC tests -->
39283911

3929-
<test name="ERI_D_Ld9" grid="f45_f45_mg37" compset="1850_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/default">
3912+
<test name="ERI_D_Ld9" grid="f45_f45_mg37" compset="I1850Clm60Bgc" testmods="clm/default">
39303913
<machines>
39313914
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
39323915
</machines>
@@ -3936,19 +3919,19 @@
39363919
</options>
39373920
</test>
39383921

3939-
<test name="ERP_D" grid="f45_f45_mg37" compset="HIST_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/decStart">
3922+
<test name="ERP_D_Ld10" grid="f45_f45_mg37" compset="IHistClm60Bgc" testmods="clm/midDecStart">
39403923
<machines>
39413924
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
39423925
</machines>
39433926
<options>
3944-
<option name="wallclock">00:20:00</option>
3927+
<option name="wallclock">00:29:00</option>
39453928
<option name="comment">""</option>
39463929
</options>
39473930
</test>
39483931

3949-
<test name="ERP_Ld761" grid="f45_f45_mg37" compset="HIST_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/monthly">
3932+
<test name="ERP_Ld761" grid="f45_f45_mg37" compset="IHistClm60Bgc" testmods="clm/monthly">
39503933
<machines>
3951-
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
3934+
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
39523935
</machines>
39533936
<options>
39543937
<option name="wallclock">00:50:00</option>
@@ -3958,17 +3941,17 @@
39583941

39593942
<!-- BGCCrop tests -->
39603943

3961-
<test name="ERI_Ld9" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/default">
3944+
<test name="ERI_Ld9" grid="f45_f45_mg37" compset="I2000Clm60BgcCrop" testmods="clm/default">
39623945
<machines>
3963-
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
3946+
<machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
39643947
</machines>
39653948
<options>
39663949
<option name="wallclock">00:20:00</option>
39673950
<option name="comment">""</option>
39683951
</options>
39693952
</test>
39703953

3971-
<test name="ERP_D_Ld10" grid="f45_f45_mg37" compset="HIST_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/default">
3954+
<test name="ERP_D_Ld10" grid="f45_f45_mg37" compset="IHistClm60BgcCrop" testmods="clm/default">
39723955
<machines>
39733956
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
39743957
</machines>
@@ -3978,7 +3961,7 @@
39783961
</options>
39793962
</test>
39803963

3981-
<test name="ERP_D_Ld3" grid="f45_f45_mg37" compset="2000_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/coldStart">
3964+
<test name="ERP_D_Ld3" grid="f45_f45_mg37" compset="I2000Clm60BgcCrop" testmods="clm/coldStart">
39823965
<machines>
39833966
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
39843967
</machines>
@@ -3988,17 +3971,7 @@
39883971
</options>
39893972
</test>
39903973

3991-
<test name="ERP_D_Ld3" grid="ne30pg3_ne30pg3_mtn14" compset="1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/mimics">
3992-
<machines>
3993-
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
3994-
</machines>
3995-
<options>
3996-
<option name="wallclock">00:50:00</option>
3997-
<option name="comment">""</option>
3998-
</options>
3999-
</test>
4000-
4001-
<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">
3974+
<test name="ERP_D_Ld5" grid="f45_f45_mg37" compset="I2000Clm60BgcCrop" testmods="clm/irrig_spunup">
40023975
<machines>
40033976
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
40043977
</machines>
@@ -4008,7 +3981,7 @@
40083981
</options>
40093982
</test>
40103983

4011-
<test name="SMS_Ld761" grid="f19_g17" compset="2000_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV" testmods="clm/cropMonthOutput">
3984+
<test name="SMS_Ld761" grid="f19_g17" compset="I2000Clm60BgcCrop" testmods="clm/cropMonthOutput">
40123985
<machines>
40133986
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
40143987
</machines>
@@ -4018,7 +3991,7 @@
40183991
</options>
40193992
</test>
40203993

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

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

4033-
<test name="ERS_D_Ld5" grid="1x1_mexicocityMEX" compset="2000_DATM%1PT_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV" testmods="clm/CLM1PTStartDate">
4006+
<test name="ERS_D_Ld5" grid="1x1_mexicocityMEX" compset="I1PtClm60SpRs" testmods="clm/CLM1PTStartDate">
40344007
<machines>
40354008
<machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
40364009
</machines>
40374010
<options>
4038-
<option name="wallclock">00:20:00</option>
4011+
<option name="wallclock">00:40:00</option>
40394012
<option name="comment">""</option>
40404013
</options>
40414014
</test>

0 commit comments

Comments
 (0)
⚡