Skip to content

ctsm5.4.068: Move CTSM tests from gx grids to t233 grid - #4234

Open
slevis-lmwg wants to merge 39 commits into
ESCOMP:masterfrom
slevis-lmwg:mv_gx_tests_to_t233
Open

slevis-lmwg wants to merge 39 commits into
ESCOMP:masterfrom
slevis-lmwg:mv_gx_tests_to_t233

Conversation

@slevis-lmwg

@slevis-lmwg slevis-lmwg commented Sep 30, 2026 •

Copy link
Copy Markdown
Contributor

Description of changes

Similar to #4223 but for g16, g17, g37 grids

Specific notes

Contributors other than yourself, if any: @ekluzek

CTSM issues resolved or otherwise addressed, if any:
Contributes to #2540 (resolves?)

Testing planned or performed, if any:
aux_clm and others, see below

Erik, editing to say we should run most test lists as almost all tests change:

  • aux_clm Derecho
  • aux_clm Izumi
  • fates Derecho
  • fates Izumi
  • ctsm_sci Derecho

Requirements before merge:

  • The code in this PR branch builds with no errors.
  • The code in this PR branch runs with no errors. Briefly describe tested configuration(s):
  • This does not change answers for unchanged tests; tests going from gx grids to t233 run on the new grid and have their names updated, so the test-suites will not compare them to the baseline
  • This PR includes required documentation updates (see guidelines for contributing documentation).

@slevis-lmwg slevis-lmwg self-assigned this Sep 30, 2026
@slevis-lmwg slevis-lmwg added the b4b bit-for-bit label Sep 30, 2026
@ekluzek ekluzek added the next this should get some attention in the next week or two. Normally each Thursday SE meeting. label Sep 30, 2026
@ekluzek

ekluzek commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

I'd call this as something that should go on master, because when compsets change you can't verify that things are b4b. And hence it could hide an accidental non-b4b change on the b4b-dev branch after this was merged.

@wwieder wwieder added testing additions or changes to tests and removed next this should get some attention in the next week or two. Normally each Thursday SE meeting. b4b bit-for-bit labels Oct 1, 2026
@wwieder wwieder added this to the ctsm6.0.0 (code freeze) milestone Oct 1, 2026
@slevis-lmwg
slevis-lmwg changed the base branch from b4b-dev to master October 2, 2026 14:49
Comment thread cime_config/testdefs/testlist_clm.xml Outdated
Comment thread cime_config/testdefs/testlist_clm.xml Outdated
Comment thread cime_config/testdefs/testlist_clm.xml Outdated
@slevis-lmwg slevis-lmwg changed the title Move CTSM tests from gx grids to t233 grid ctsm5.4.0xx: Move CTSM tests from gx grids to t233 grid Oct 5, 2026

@ekluzek ekluzek left a comment

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.

We went over this together. And I noted the thing about g37 grids should be t201 as the low resolution MOM grid. And we realized that MOSART and RTM (and ccs_config) also need to be updated similarly.

Comment thread cime_config/testdefs/ExpectedTestFails.xml Outdated
@slevis-lmwg slevis-lmwg added the blocked: dependency Wait to work on this until dependency is resolved label Oct 5, 2026
@slevis-lmwg

Copy link
Copy Markdown
Contributor Author

Marking "blocked" due to the checkbox above stating that we need to "add to ccs_config: ne30_t233, f19_t233_gris4 and make new tag"

ctsm5.4.063: Move CTSM tests from t232 to t233

Updating testlist_clm.xml, ExpectedTestFails.xml, config_compsets.xml, and documentation that needs updating.

NB: Moving tests from t232 to t233 but postpone the change for LII2 tests (issue ESCOMP#4245).

Changes answers relative to the baseline, only for cases with grids that changed to the t233 grid, and only due to the grid update.

PR ESCOMP#4223
Resolves issue ESCOMP#4238 by removing NorESM test
Contributes to ESCOMP#2540 Move testing from POP to MOM masks

slevis resolved conflicts:
cime_config/testdefs/testlist_clm.xml
@slevis-lmwg slevis-lmwg changed the title ctsm5.4.0xx: Move CTSM tests from gx grids to t233 grid ctsm5.4.065: Move CTSM tests from gx grids to t233 grid Oct 15, 2026
@slevis-lmwg

slevis-lmwg commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor Author

Since updating submodules... Consider updating CIME for #4239 here?

From meeting with Erik: No, because this PR here is effectively an answer-changing PR.

@slevis-lmwg

slevis-lmwg commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor Author
  • FAIL... Regarding the LVG test, Erik suggested pointing the test to the finidat generated previously by the test itself to see if it passes; I pointed to the finidat found in the test's case2 (manually reintroducing use_init_interp and related settings as found in the original test, but exice is still different) and rerunning cs.status.20261016_182626_h14wtz
  • FAIL... Repeat with the finidat found in the test's case1 (manually reintroducing use_init_interp and related settings as found in the original test, but exice is still different) and rerunning cs.status.20261016_182626_h14wtz
  • PASS Confirm that LVG passes vanilla ctsm5.4.063: ./create_test LVG_Ld5_D.f10_f10_mg37.I1850Clm60Bgc.derecho_intel.clm-no_vector_output -c /glade/campaign/cgd/tss/ctsm_baselines/ctsm5.4.063 with cs.status.20261016_183745_cle1ai

@billsacks

Copy link
Copy Markdown
Member

Sorry that I didn't see the question about the LVG test earlier.

I do not expect changing finidat to resolve this.

I checked the test failure, and I see that the only field that differs is PCT_GLC_MEC. I think the right thing to do is to simply exclude this history field from the test, using hist_fexcl. You can do this via append_to_user_nl_files in lvg.py. (You can give a list of strings to append to the user_nl files; do this hist_fexcl for both case1 and case2.)

I think I understand why this is needed: There is a grid cell on the south tip of South America that has 0% glacier which must newly be present within the land mask (I haven't looked at the change in land mask, but I assume that's why it's a problem now). In the base case, this has 0% for each glacier column, but in the case with extra virtual glacier, it must fall within the Antarctica mask, and so it is given non-zero percentages in each column. This is a fine difference and should just be ignored.

@samsrabin samsrabin changed the title ctsm5.4.065: Move CTSM tests from gx grids to t233 grid ctsm5.4.066: Move CTSM tests from gx grids to t233 grid Oct 19, 2026
samsrabin and others added 3 commits October 20, 2026 10:36
Fix scheduled docs-update-ctsm_pylib workflow

slevis resolved conflicts:
cime_config/testdefs/testlist_clm.xml
doc/ChangeLog
doc/ChangeSum
@slevis-lmwg

slevis-lmwg commented Oct 21, 2026 •

Copy link
Copy Markdown
Contributor Author

In prep for the merge
./run_sys_tests -s aux_clm -c ctsm5.4.065 -g ctsm5.4.065_PR4234

  • izumi
  • derecho investigate
    FAIL LII2FINIDATAREAS_D_P256x2_Ld1.f09_t232.I1850Clm60BgcCrop.derecho_intel.clm-default--clm-matrixcnOn_ignore_warnings COMPARE_base_no_interp
    FAIL LII2FINIDATAREAS_D_P256x2_Ld1.f09_t232.I1850Clm60BgcCrop.derecho_intel.clm-default COMPARE_base_no_interp

My comment from last time sounded as though I had resolved the LII2 test failures, but it seems I forgot to update their grids in testlist_clm.xml, so doing now.

@wwieder wwieder changed the title ctsm5.4.066: Move CTSM tests from gx grids to t233 grid ctsm5.4.067: Move CTSM tests from gx grids to t233 grid Oct 22, 2026
slevis resolved conflicts:
doc/ChangeLog
doc/ChangeSum
@slevis-lmwg

Copy link
Copy Markdown
Contributor Author

Most recent testing discussed in the ccs_config PR. Erik and I agreed to remove a failing test as irrelevant because it turns on matrixcn in an IHist compset.

@slevis-lmwg

slevis-lmwg commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor Author

@slevis-lmwg

slevis-lmwg commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor Author

@ekluzek I will rerun aux_clm now that I have fully updated ccs_config. I expect the same results that I got when I ran aux_clm from ESMCI/ccs_config_cesm#313.

./run_sys_tests -s aux_clm -c aux_clm-ctsm5.4.067-ccs_config_cesm1.0.94 -g ctsm5.4.067

  • derecho
  • izumi
  • update ChangeLog/Sum
  • I repeated python and namelist testing seen above

Could you do a final review of this PR?

@slevis-lmwg

Copy link
Copy Markdown
Contributor Author

@ekluzek testing was good, so I'm ready.

@@ -2604,7 +2592,7 @@
<option name="comment">Repeat LII_D... test with matrixcnOn</option>
</options>
</test>
<test name="LII2FINIDATAREAS_D_P256x2_Ld1" grid="f09_t232" compset="I1850Clm60BgcCrop" testmods="clm/default">
<test name="LII2FINIDATAREAS_D_P256x2_Ld1" grid="f09_t233" compset="I1850Clm60BgcCrop" testmods="clm/default">

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 LII2 tests need to go back to t232 as part of reverting namelist_defaults as per Erik's review.

@slevis-lmwg slevis-lmwg changed the title ctsm5.4.067: Move CTSM tests from gx grids to t233 grid ctsm5.4.068: Move CTSM tests from gx grids to t233 grid Oct 29, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

blocked: dependency Wait to work on this until dependency is resolved testing additions or changes to tests

Projects

Status: In progress - master
Status: In Progress

Development

Successfully merging this pull request may close these issues.

5 participants