Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FATES API35 parameter file update #2436

Merged
merged 13 commits into from
Apr 26, 2024

Conversation

glemieux
Copy link
Collaborator

@glemieux glemieux commented Mar 25, 2024

Description of changes

This updates the default FATES parameter file and should be coordinated with NGEET/fates#1128. The fates externals tag updates also brings with it a number of fates scientific updates and bug fixes since tag sci.1.72.2_api.34.0.0.

This PR also cleans up the expected failures list to remove out-of-date cheyenne fates testmods. It also adds a new test that is expected to fail per #2423.

Finally, it adds build namelist code to make fates hydro and sp mode incompatible for the time being.

Specific notes

Contributors other than yourself, if any: @rgknox

CTSM Issues Fixed (include github issue #):
Fixes #2478

Are answers expected to change (and if so in what way)? Yes, but only for fates. One new expected failure for aux_clm that has been added.

Any User Interface Changes (namelist or namelist defaults changes)? new fates parameter file, check for a failure condition

Testing performed, if any: standard FATES testing

@glemieux
Copy link
Collaborator Author

glemieux commented Apr 9, 2024

To do list on top of the usual list:

  • add fates hydro + sp failure mode unit test
  • test fates hydro + sp failure mode

glemieux added 2 commits April 9, 2024 12:22
This also adds a corresponding namelist build unit test and similar
test to check that sp mode + spitfire fails
@glemieux
Copy link
Collaborator Author

Running build-namelist_test.pl to fail test the new fates namelist graceful failures passed test successfully.

Merge b4b-dev

Some fixes for run_neon that came up in ctsm5.1.dev172.
Small bug fix for units of vector format hillslope hydrology.
Start adding PLUMBER2 users-mods (NOT functional)
@glemieux
Copy link
Collaborator Author

Regression testing is complete and show all expected tests pass B4B on derecho with one exception. SMS.f10_f10_mg37.I2000Clm50BgcCrop.derecho_nvhpc.clm-cro failed during the MODEL_BUILD step. All fates diffs are expected due to science updates.

Results: /glade/u/home/glemieux/scratch/ctsm-tests/tests_pr2436-aux_clm-final

Regression testing on izumi shows all expected tests are B4B. The only DIFFs are the fates tests which are as expected.

Results: /home/glemieux/scratch/ctsm-tests/tests_pr2436-aux_clm

@ekluzek
Copy link
Collaborator

ekluzek commented Apr 23, 2024

@glemieux on the failing test. The clm60 version is marked as failing as well. And it looks like there's a copied version of it. So it probably just needs to have both the clm50 and clm60 version in expected fails. So this looks fine to me. Thanks for pointing it out.

Copy link
Collaborator

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

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

Good to bring this in. The CTSM side changes are small, so not a lot to say. There's some small things I noticed in terms of comments for the testlist and Expected fails. Since, @glemieux is out and it's simple I'll do that.

Thanks for doing the testing @glemieux.

bld/unit_testers/build-namelist_test.pl Show resolved Hide resolved
cime_config/testdefs/ExpectedTestFails.xml Show resolved Hide resolved
cime_config/testdefs/testlist_clm.xml Show resolved Hide resolved
cime_config/testdefs/testlist_clm.xml Show resolved Hide resolved
cime_config/testdefs/ExpectedTestFails.xml Outdated Show resolved Hide resolved
@ekluzek ekluzek merged commit 286146f into ESCOMP:master Apr 26, 2024
2 checks passed
@ekluzek ekluzek deleted the fates-api35-param_update branch April 26, 2024 17:52
@ekluzek ekluzek self-assigned this Apr 26, 2024
@ekluzek ekluzek added enhancement new capability or improved behavior of existing capability FATES API update Changes to the FATES version that also REQUIRE an API change in CTSM labels Apr 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement new capability or improved behavior of existing capability FATES API update Changes to the FATES version that also REQUIRE an API change in CTSM
Projects
Status: Done (non release/external)
Status: Done
Development

Successfully merging this pull request may close these issues.

FATES Sat phenology test failing restart starting in ctsm5.1.dev174
3 participants