Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
9a646d4
Change tests from g17 to t233 grid except when unavailable
slevis-lmwg Sep 29, 2026
a93976a
Change tests from g37 to t233 grid except when unavailable
slevis-lmwg Sep 29, 2026
12e9f68
Replace g17 and g37 grids with t233 in ExpectedTestFails.xml
slevis-lmwg Sep 30, 2026
29335e3
Change g37 to t233 grid in test_rxcropmaturity_python.sh
slevis-lmwg Sep 30, 2026
c99aab1
Change g37 to t233 grid in lilac_build_ctsm.py
slevis-lmwg Sep 30, 2026
bffdfe5
Replace g17/g37 grids with t233 in .rst files where seemed appropriate
slevis-lmwg Sep 30, 2026
9acf995
Merge branch 'b4b-dev' into mv_gx_tests_to_t233
slevis-lmwg Oct 2, 2026
5c193ca
Merge branch 'master' into mv_gx_tests_to_t233
slevis-lmwg Oct 2, 2026
1e98a68
Corrections to conflict resolution of the last commit
slevis-lmwg Oct 2, 2026
3b5bf2f
Merge tag 'ctsm5.4.063' into mv_gx_tests_to_t233
slevis-lmwg Oct 6, 2026
7f91c76
Correct my f10_f10_mg37 changes from f10_f10_mt233 to f10_f10_mt201
slevis-lmwg Oct 6, 2026
ff5c1e6
Update to f19_t233_gris4 and ne30_t233 from g17 grids
slevis-lmwg Oct 6, 2026
cf8cd35
Update f45 grids from g37 to t201
slevis-lmwg Oct 6, 2026
79bdacf
Change grids to t233 or t201 as needed
slevis-lmwg Oct 6, 2026
1b460ae
Add tx2_0v1 and tx2_3v3 to valid_values in namelist_definition_ctsm.xml
slevis-lmwg Oct 6, 2026
646074e
Add tx2_0v1 and tx2_3v3 to namelist_defaults_overall.xml for some grids
slevis-lmwg Oct 6, 2026
054c6bd
Replace tx2_3v2 with v3 when setting init_interp_attributes and finidat
slevis-lmwg Oct 6, 2026
d347a00
Replace gx1v7 with tx2_3v3 in build-namelist_test.pl
slevis-lmwg Oct 7, 2026
a12c4ef
Update gx1v7 to tx2_3v3 in README_on_CTSM.md
slevis-lmwg Oct 7, 2026
678c488
Replace gx1v7 mask with tx2_3v3 in namelist_defaults_ctsm.xml
slevis-lmwg Oct 8, 2026
0ef0e4d
Update rtm1_0_89 to 90 and mosart1.1.13 to 14
slevis-lmwg Oct 13, 2026
be2c45b
Remove test from expected fails because it passes consistently
slevis-lmwg Oct 13, 2026
0dd5277
Put LII_ tests back to f19_g17 grid until we have approp. IC (#4245)
slevis-lmwg Oct 13, 2026
eb2d9b8
Put PFS tests back to f19_g17 grid until we have approp. IC
slevis-lmwg Oct 14, 2026
ac854d3
Determining namelist defaults, remove gx-grid lines that we do not need
slevis-lmwg Oct 16, 2026
6c2e9ce
Update I1850Clm60BgcNoAnthroRtm test to not use matrixcn
slevis-lmwg Oct 16, 2026
cd1e1a0
Add hist_fexcl1 = 'PCT_GLC_MEC' to lvg.py for LVG test to pass
slevis-lmwg Oct 19, 2026
79d0155
Update ChangeLog/Sum for ctsm5.4.065.
samsrabin Oct 20, 2026
d5d2314
Merge tag 'ctsm5.4.065' into mv_gx_tests_to_t233
slevis-lmwg Oct 20, 2026
0b28ede
Draft ChangeLog/Sum
slevis-lmwg Oct 21, 2026
19c0225
Update LII2 tests from the t232 to the t233 grid
slevis-lmwg Oct 21, 2026
75c6999
Reorder f10_f10_ais8gris4_mt201 to f10_f10_mt201_ais8gris4 in aux_clm
slevis-lmwg Oct 21, 2026
11e6cf1
Merge remote-tracking branch 'escomp/master' into mv_gx_tests_to_t233
slevis-lmwg Oct 26, 2026
dbb2384
Remove failing ERP IHist test as irrelevant because using matrixcn
slevis-lmwg Oct 26, 2026
1d4d1b3
Revert 75c69995c5cef83ff8b76025d36d1252bd34a0aa
slevis-lmwg Oct 27, 2026
bf58b69
Update from ccs_config_cesm1.0.92 to ccs_config_cesm1.0.97
slevis-lmwg Oct 28, 2026
22f2933
Remove three passing tests from clm's expected failures
slevis-lmwg Oct 28, 2026
d478f0f
Updated ChangeLog/Sum
slevis-lmwg Oct 28, 2026
d1a0a1f
Update the date in ChangeLog/Sum
slevis-lmwg Oct 29, 2026
23d885b
Revert to unchanged namelist_defaults_ctsm.xml before modifying it
slevis-lmwg Oct 30, 2026
4b9b79b
Merge remote-tracking branch 'escomp/master' into mv_gx_tests_to_t233
slevis-lmwg Oct 30, 2026
24d8822
Two finidat settings where mask should have been gx1v7
slevis-lmwg Oct 30, 2026
9223e3b
Update README_on_CTSM.md
slevis-lmwg Oct 30, 2026
11728b5
Merge remote-tracking branch 'slevis-lmwg/mv_gx_tests_to_t233' into m…
slevis-lmwg Oct 30, 2026
04d6c22
One init_interp_attributes setting where mask should have been gx1v7
slevis-lmwg Oct 30, 2026
84bd3bc
Second init_interp_attributes where I'm reverting mask to gx1v7
slevis-lmwg Oct 30, 2026
fb24203
Revert LII2 tests back to t232
slevis-lmwg Oct 30, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
[submodule "rtm"]
path = components/rtm
url = https://github.com/ESCOMP/RTM
fxtag = rtm1_0_89
fxtag = rtm1_0_90
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/RTM

[submodule "mosart"]
path = components/mosart
url = https://github.com/ESCOMP/MOSART
fxtag = mosart1.1.13
fxtag = mosart1.1.14
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
Expand All @@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.92
fxtag = ccs_config_cesm1.0.97
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
Expand Down
2 changes: 1 addition & 1 deletion README_on_CTSM.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ QUICKSTART: using the NUOPC driver scripts
cd $CIMEROOT/scripts
./create_newcase # get help on how to run create_newcase
./create_newcase --case testI --res f09_t233 --compset I2000Clm60BgcCrop
# create new "I" case for default machine at 1.9x2.5_gx1v7
# create new "I" case for default machine at 1.9x2.5 (roughly 2 degree resolution) with a tx2_3v3 land/ocean mask (2/3rds degree ocean mask for MOM6)
# "I2000Clm60BgcCrop" case is clm6_0 physics, CDEPS, and inactive ice/ocn/glc
# and MOSART for river-routing
cd testI
Expand Down
11 changes: 7 additions & 4 deletions bld/namelist_files/namelist_defaults_ctsm.xml

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, it looks like this entire file should go back to what it was before.

There are only a few exceptions to that for IC files that didn't accurately represent the actual mask they were run for.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the exceptions, reverting back to the previous version of the file and then doing a few targetted changes seems to make sense to me. Both the finidat and init_interp_attributes need to change for it to be correct.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Below I put

THIS IS A REAL CHANGE TO KEEP

to mark that few changes that should be done, to pair the file with the mask it was run at.

@slevis-lmwg slevis-lmwg Oct 30, 2026 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[...] Both the finidat and init_interp_attributes need to change for it to be correct.

There were two cases with "THIS IS A REAL CHANGE TO KEEP" as follows:

 <!-- Corresponding f19 -->
-<finidat hgrid="1.9x2.5" mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."
+<finidat hgrid="1.9x2.5" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          sim_year="1850" do_transient_pfts=".false." use_excess_ice=".true."
          use_crop=".false."
          phys="clm6_0"
@@ -1525,7 +1525,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 >lnd/clm2/initdata_esmf/ctsm5.4/clmi.f19_twiceinterp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c251030.nc
 </finidat>
 <!-- NB: This f19 2000 finidat comes from a spin-up with use_crop=".false." -->
-<finidat hgrid="1.9x2.5"    maxpft="79"  mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."
+<finidat hgrid="1.9x2.5"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false." use_excess_ice=".true."
          ic_tod="0" glc_nec="10" use_crop=".true."
          phys="clm6_0" use_init_interp=".true."

Now comes the challenge of finding the corresponding init_interp_attributes:

  • The 1850 seems obvious, and I already committed the change in 04d6c22
  • The 2000 is less obvious because the only other 1.9x2.5 case with mask="tx2_3v2" looks like this. If it's the one, I will change it only for 1.9x2.5.
<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." phys="clm6_0"
                        hgrid="1.9x2.5"
>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true.
</init_interp_attributes>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or I should look for an already existing 1.9x2.5 with gx1v7 for 2000, in case it's already there and does not need changing. (I need to go for the next two hours or so, I will check when I return.)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These appear similar other than for the lnd_tuning_mode, so I suspect that I posted the correct one above:

<init_interp_attributes sim_year="2000" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
                        hgrid="1.9x2.5"
>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false.
</init_interp_attributes>

<init_interp_attributes sim_year="2000" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam7.0"
                        hgrid="1.9x2.5"
>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false.
</init_interp_attributes>

Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).

<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." phys="clm6_0"
hgrid="1.9x2.5"
>mask=tx2_3v2 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.false. irrigate=.false.
>mask=gx1v7 use_cn=.true. do_transient_pfts=.false. use_excess_ice=.true. use_crop=.false. irrigate=.false.
</init_interp_attributes>
<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." phys="clm6_0"
hgrid="ne30np4.pg3"
Expand Down Expand Up @@ -1325,10 +1325,13 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
</init_interp_attributes>

<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." phys="clm6_0"
hgrid="1.9x2.5"
>hgrid=0.9x1.25 maxpft=79 mask=tx2_3v2 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true.
</init_interp_attributes>

<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." phys="clm6_0"
>hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. glc_nec=10 use_excess_ice=.true.
</init_interp_attributes>

<init_interp_attributes sim_year="1979" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm6_0_cam6.0"
hgrid="ne0np4.ARCTIC.ne30x4" use_cn=".false." maxpft="17"
>hgrid=ne0np4.ARCTIC.ne30x4 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false.
Expand Down Expand Up @@ -1489,7 +1492,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.015_BGCcrop_ne30_144_pSASU.clm2.r.0181-01-01-00000.nc
</finidat>
<!-- Corresponding f19 -->
<finidat hgrid="1.9x2.5" mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."
<finidat hgrid="1.9x2.5" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
sim_year="1850" do_transient_pfts=".false." use_excess_ice=".true."
use_crop=".false."
phys="clm6_0"
Expand Down Expand Up @@ -1525,7 +1528,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
>lnd/clm2/initdata_esmf/ctsm5.4/clmi.f19_twiceinterp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c251030.nc
</finidat>
<!-- NB: This f19 2000 finidat comes from a spin-up with use_crop=".false." -->
<finidat hgrid="1.9x2.5" maxpft="79" mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."
<finidat hgrid="1.9x2.5" maxpft="79" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false." use_excess_ice=".true."
ic_tod="0" glc_nec="10" use_crop=".true."
phys="clm6_0" use_init_interp=".true."
Comment thread
slevis-lmwg marked this conversation as resolved.
Resolved
Expand Down
23 changes: 7 additions & 16 deletions bld/namelist_files/namelist_defaults_overall.xml
Comment thread
slevis-lmwg marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
Expand Up @@ -79,26 +79,17 @@ determine default values for namelists.
<ssp_rcp>hist</ssp_rcp>

<!-- Default land/ocean mask type -->
Comment thread
slevis-lmwg marked this conversation as resolved.
Resolved
<mask hgrid="0.23x0.31" >gx1v6</mask>
<mask hgrid="0.47x0.63" >gx1v6</mask>
<mask hgrid="0.9x1.25" >gx1v7</mask>
<mask hgrid="1.9x2.5" >gx1v7</mask>
<mask hgrid="2.5x3.33" >gx3v7</mask>
<mask hgrid="4x5" >gx3v7</mask>
<mask hgrid="10x15" >gx3v7</mask>
<mask hgrid="0.9x1.25" >tx2_3v3</mask>
<mask hgrid="1.9x2.5" >tx2_3v3</mask>
<mask hgrid="4x5" >tx2_0v1</mask>
<mask hgrid="10x15" >tx2_0v1</mask>

<mask hgrid="360x720cru" >cruncep</mask>
<mask hgrid="128x256" >gx1v7</mask>
<mask hgrid="64x128" >gx1v7</mask>
<mask hgrid="48x96" >gx3v7</mask>
<mask hgrid="32x64" >gx3v7</mask>
<mask hgrid="8x16" >gx3v7</mask>

<mask hgrid="94x192" >T62</mask>

<mask hgrid="ne120" >gx1v6</mask>
<mask hgrid="ne240" >gx1v6</mask>
<mask hgrid="ne30" >gx1v6</mask>
<mask hgrid="ne120" >tx2_3v3</mask>
<mask hgrid="ne30" >tx2_3v3</mask>

<mask hgrid="0.125nldas2" >nldas2</mask>
<mask hgrid="5x5_amazon" >navy</mask>
Expand All @@ -110,7 +101,7 @@ determine default values for namelists.
<mask hgrid="1x1_numaIA" >navy</mask>
<mask hgrid="1x1_smallvilleIA" >test</mask>
<mask hgrid="1x1_cidadinhoBR" >test</mask>
<mask >gx1v7</mask>
<mask >tx2_3v3</mask>

<!-- Default glacier model options -->

Expand Down
2 changes: 1 addition & 1 deletion bld/namelist_files/namelist_definition_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2406,7 +2406,7 @@ hist means do NOT use a future scenario, just use historical data.

<entry id="mask" type="char*10" category="default_settings"
group="default_settings"
valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx0.1v3,tx1v1,T62,cruncep,nldas2">
valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx0.1v3,tx1v1,tx2_0v1,tx2_3v3,T62,cruncep,nldas2">
Land mask description
</entry>

Expand Down
2 changes: 1 addition & 1 deletion bld/unit_testers/build-namelist_test.pl
Original file line number Diff line number Diff line change
Expand Up @@ -2145,7 +2145,7 @@ sub cat_and_create_namelistinfile {
# Run over the different lnd_tuning modes
#
my $res = "0.9x1.25";
my $mask = "gx1v7";
my $mask = "tx2_3v3";
my $simyr = "1850";
foreach my $phys ( "clm4_5", "clm5_0", "clm6_0" ) {
my $mode = "-phys $phys";
Expand Down
12 changes: 12 additions & 0 deletions cime_config/SystemTests/lvg.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

This will only pass if there are no column or patch-level outputs in CLM's
history files.

In PR #4234, which updated from gx (POP) to tx (MOM) grids, this test failed in COMPARE_base_more_virtual until we added the fexcl statement below for PCT_GLC_MEC in both case1 and case2. Bill Sacks posted in this PR that the MOM grid had a grid cell on the south tip of South America with 0% glacier that likely was newly present in the land mask, and with extra virtual glacier (case2) it was given non-zero percentages in each glacier column due to falling within the Antarctica mask. The PCT_GLC_MEC difference was valid and as such could be excluded from the test.
Comment thread
slevis-lmwg marked this conversation as resolved.
Resolved
"""

from CIME.SystemTests.system_tests_compare_two import SystemTestsCompareTwo
Expand All @@ -34,10 +36,20 @@ def _case_one_setup(self):
component="clm",
contents="glacier_region_behavior = 'single_at_atm_topo', 'UNSET', 'virtual', 'multiple'",
)
append_to_user_nl_files(
caseroot=self._get_caseroot(),
component="clm",
contents="hist_fexcl1 = 'PCT_GLC_MEC'",
)

def _case_two_setup(self):
append_to_user_nl_files(
caseroot=self._get_caseroot(),
component="clm",
contents="glacier_region_behavior = 'single_at_atm_topo', 'UNSET', 'virtual', 'virtual'",
)
append_to_user_nl_files(
caseroot=self._get_caseroot(),
component="clm",
contents="hist_fexcl1 = 'PCT_GLC_MEC'",
)
55 changes: 17 additions & 38 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</phase>
</test>

<test name="SMS_Ld5.f09_g17.ISSP245Clm50BgcCrop.derecho_intel.clm-ciso_dec2050Start">
<test name="SMS_Ld5.f09_t233.ISSP245Clm50BgcCrop.derecho_intel.clm-ciso_dec2050Start">
<phase name="RUN">
<status>FAIL</status>
<issue>#4165</issue>
Expand All @@ -51,7 +51,7 @@
</test>

<!-- Hillslope test suite fails -->
<test name="SMS_D_Ld3.f10_f10_mg37.I1850Clm60Bgc.derecho_intel.clm-HillslopeFromFile">
<test name="SMS_D_Ld3.f10_f10_mt201.I1850Clm60Bgc.derecho_intel.clm-HillslopeFromFile">
<phase name="RUN">
<status>FAIL</status>
<issue>#4169</issue>
Expand Down Expand Up @@ -82,36 +82,29 @@
</phase>
</test>

<test name="ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="BASELINE">
<status>FAIL</status>
<issue>#2619</issue>
<comment>This failure relates to the following REP failure.</comment>
</phase>
</test>
<test name="REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<test name="REP_P64x2_Ld396.f10_f10_mt201.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="COMPARE_base_rep2">
<status>FAIL</status>
<issue>#2619</issue>
<comment>This failure relates to the preceding ERP failure.</comment>
</phase>
</test>
<test name="REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<test name="REP_P64x2_Ld396.f10_f10_mt201.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="BASELINE">
<status>FAIL</status>
<issue>#2619</issue>
<comment>This failure relates to the preceding ERP failure.</comment>
</phase>
</test>

<test name="FUNITCTSM_P1x1.f10_f10_mg37.I2000Clm50Sp.izumi_intel">
<test name="FUNITCTSM_P1x1.f10_f10_mt201.I2000Clm50Sp.izumi_intel">
<phase name="RUN">
<status>FAIL</status>
<issue>#3182</issue>
</phase>
</test>

<test name="ERP_D_P64x2_Ld10.f10_f10_mg37.I2000Clm60Bgc.derecho_intel.clm-Hillslope">
<test name="ERP_D_P64x2_Ld10.f10_f10_mt201.I2000Clm60Bgc.derecho_intel.clm-Hillslope">
<phase name="RUN">
<status>FAIL</status>
<issue>#3788</issue>
Expand Down Expand Up @@ -160,7 +153,7 @@
</phase>
</test>

<test name="ERP_P256x2_Ld30.f45_f45_mg37.I2000Clm60Fates.derecho_intel.clm-mimicsFatesCold">
<test name="ERP_P256x2_Ld30.f45_f45_mt201.I2000Clm60Fates.derecho_intel.clm-mimicsFatesCold">
<phase name="RUN">
<status>FAIL</status>
<issue>#2261</issue>
Expand All @@ -172,20 +165,6 @@
</phase>
</test>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's strange that these are passing now, as we didn't change mizuRoute. And actually looking at baselines it sometimes passes and sometimes doesn't. For example, see...

grep NLCOMP $BASELINE/ctsm5.4.0[456]?/SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default/TestStatus | grep PASS
/glade/campaign/cgd/tss/ctsm_baselines/ctsm5.4.042/SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default/TestStatus:PASS SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default NLCOMP
/glade/campaign/cgd/tss/ctsm_baselines/ctsm5.4.053/SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default/TestStatus:PASS SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default NLCOMP
/glade/campaign/cgd/tss/ctsm_baselines/ctsm5.4.058/SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default/TestStatus:PASS SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default NLCOMP
/glade/campaign/cgd/tss/ctsm_baselines/ctsm5.4.063/SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default/TestStatus:PASS SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default NLCOMP
/glade/campaign/cgd/tss/ctsm_baselines/ctsm5.4.067/SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default/TestStatus:PASS SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default NLCOMP

So it only passes some of the time, a few tags every series. I'm not quite sure when it passes and when it doesn't, but it seems best if we leave it as an expected fail for now.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I suggest reverting this and leaving it back like it was before.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I have a feeling it's the izumi ones that fail. I'm waiting to see what happens in my latest round of testing.

<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_gnu.mizuroute-default">
<phase name="NLCOMP">
<status>FAIL</status>
<issue>ESMCI/cime#4966</issue>
</phase>
</test>

<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default">
<phase name="NLCOMP">
<status>FAIL</status>
<issue>ESMCI/cime#4966</issue>
</phase>
</test>

<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default">
<phase name="RUN">
<status>FAIL</status>
Expand All @@ -202,25 +181,25 @@

<!-- fates test suite failures -->

<!--- NOTE: This test is also in aux_clm, but just including it here so it's not duplicated -->
<!--- NOTE: Tests also in aux_clm can be included under this comment to avoid duplication -->

<!-- This is commented out because cime currently does NOT allow longnames in the XML in the XSD for this file
<test name="ERS_D_Ld30.f45_f45_mg37.HIST_DATM%CRUv7_CLM50%FATES_SICE_SOCN_SROF_SGLC_SWAV_SESP.izumi_nag.clm-FatesColdLandUse">
<test name="ERS_D_Ld30.f45_f45_mt201.HIST_DATM%CRUv7_CLM50%FATES_SICE_SOCN_SROF_SGLC_SWAV_SESP.izumi_nag.clm-FatesColdLandUse">
<phase name="RUN">
<status>FAIL</status>
<issue>#3500</issue>
</phase>
</test>
-->

<test name="ERP_D_Ld90.f45_f45_mg37.I2000Clm60Fates.izumi_nag.clm-FatesColdCStarvationExp">
<test name="ERP_D_Ld90.f45_f45_mt201.I2000Clm60Fates.izumi_nag.clm-FatesColdCStarvationExp">
<phase name="MEMLEAK">
<status>FAIL</status>
<issue>#4174</issue>
</phase>
</test>

<test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50Fates.izumi_nag.clm-FatesColdPRT2">
<test name="ERS_D_Ld30.f45_f45_mt201.I2000Clm50Fates.izumi_nag.clm-FatesColdPRT2">
<phase name="RUN">
<status>PEND</status>
<issue>FATES#983</issue>
Expand All @@ -242,28 +221,28 @@
</phase>
</test>

<test name="PVT_Lm3.f45_f45_mg37.I2000Clm50Fates.derecho_intel.clm-FatesLUPFT">
<test name="PVT_Lm3.f45_f45_mt201.I2000Clm50Fates.derecho_intel.clm-FatesLUPFT">
<phase name="RUN">
<status>FAIL</status>
<issue>#2919</issue>
</phase>
</test>

<test name="SMS_D_Ld180.f45_f45_mg37.I2000Clm60Fates.derecho_intel.clm-FatesColdTRS">
<test name="SMS_D_Ld180.f45_f45_mt201.I2000Clm60Fates.derecho_intel.clm-FatesColdTRS">
<phase name="RUN">
<status>FAIL</status>
<issue>FATES#1534</issue>
</phase>
</test>

<test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50Fates.izumi_nag.clm-FatesColdLUH2">
<test name="ERS_D_Ld30.f45_f45_mt201.I2000Clm50Fates.izumi_nag.clm-FatesColdLUH2">
<phase name="RUN">
<status>FAIL</status>
<issue>#2653</issue>
</phase>
</test>

<test name="SMS_D_Ld3.f09_g17.I2000Clm60FatesSpCrujra.derecho_gnu.clm-FatesColdSatPhen_prescribed">
<test name="SMS_D_Ld3.f09_t233.I2000Clm60FatesSpCrujra.derecho_gnu.clm-FatesColdSatPhen_prescribed">
<phase name="RUN">
<status>FAIL</status>
<issue>#2321</issue>
Expand All @@ -272,7 +251,7 @@

<!-- Other submodule test list failures (MOSART, RTM, etc. -->

<test name="SMS_Lh3.f10_f10_mg37.I2000Clm60Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">
<test name="SMS_Lh3.f10_f10_mt201.I2000Clm60Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">
<phase name="CREATE_NEWCASE">
<status>FAIL</status>
<issue>MOSART#91</issue>
Expand All @@ -296,7 +275,7 @@

<!-- interim_restart (and aux_clm) test list-->

<test name="ERI_Ld41.f10_f10_mg37.I2000Clm60BgcCrop.derecho_gnu.clm-default">
<test name="ERI_Ld41.f10_f10_mt201.I2000Clm60BgcCrop.derecho_gnu.clm-default">
<phase name="COMPARE_branch_hybrid">
<status>FAIL</status>
<issue>#3494</issue>
Expand Down
Loading
Loading