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

API 37.1 parameter file merge #1334

Merged
merged 51 commits into from
Feb 18, 2025
Merged

Conversation

glemieux
Copy link
Contributor

@glemieux glemieux commented Feb 14, 2025

Description:

This pull request merges in #1263 and #1319, which are exclusively parameter file updates, as well as #1140, which has both parameter file and feature updates, as a single merge commit that will be given one fates tag. This will also pull in the parameter file additions for #1262 in preparation for that PR coming in at a later date.

This should be coordinated with ESCOMP/CTSM#2965

Collaborators:

Expectation of Answer Changes:

Yes, consistent with answer changes due to #1140, #1263, and #1319

Checklist

If this is your first time contributing, please read the CONTRIBUTING document.

All checklist items must be checked to enable merging this pull request:

Contributor

  • The in-code documentation has been updated with descriptive comments
  • The documentation has been assessed to determine if updates are necessary

Integrator

  • FATES PASS/FAIL regression tests were run
  • Evaluation of test results for answer changes was performed and results provided

Documentation

Test Results:

CTSM (or) E3SM (specify which) test hash-tag:

CTSM (or) E3SM (specify which) baseline hash-tag:

FATES baseline hash-tag:

Test Output:

ckoven and others added 30 commits May 1, 2023 21:08
Bug fix for issue NGEET#1301

Corrects when the fraction of burnt fuel is zero'd and how the litter
mass is updated based on that fraction.
CamelCase! (camels are grazers too)

Co-authored-by: Gregory Lemieux <7565064+glemieux@users.noreply.github.com>
This minor formatting update is after running the patch parameter file
through UpdateParamAPI.py
ordering restore using ncvarsort from sci.1.80.4_api.37.0.0
include the pr number for better traceability
@glemieux
Copy link
Contributor Author

glemieux commented Feb 14, 2025

To do:

PR NGEET#1262 will be incorporated at a later date, but we are adding
the parameters to the default here to coincide with a minor API update.
Removing the date strings from the patch files as I think it doesn't
really add anything to help the user.  I also update the base file in
multiple xml files to use the fates_params_default.cdl so as to build on
the previous xml files included in this pull request.
@glemieux glemieux marked this pull request as ready for review February 18, 2025 06:45
@glemieux glemieux requested a review from rgknox February 18, 2025 18:59
@glemieux
Copy link
Contributor Author

Regression testing on derecho is complete. All tests are passing as expected and the DIFF results look consistent with individual PR tests.

Results: /glade/u/home/glemieux/ctsm/tests_pr1334-fates1

Still waiting on fates suite testing on izumi to complete.

@glemieux
Copy link
Contributor Author

Regression testing on izumi is complete and results are passing as expected.

Results: /home/glemieux/ctsm/tests_0218-144219iz

@glemieux glemieux merged commit ccc1de0 into NGEET:main Feb 18, 2025
1 check passed
glemieux added a commit to glemieux/fates that referenced this pull request Feb 20, 2025
The variable additions were incorporated via NGEET#1334
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Ready to Integrate
Development

Successfully merging this pull request may close these issues.

4 participants