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

Add CRUJRA2024 as an option to DATM_MODE #322

Open
wants to merge 9 commits into
base: main
Choose a base branch
from

Conversation

slevis-lmwg
Copy link

@slevis-lmwg slevis-lmwg commented Feb 7, 2025

Description of changes

Change the default datm input from GSWP3v1 to CRUJRA2024 for Clm6.
Add a CRUJRA2024 compset for clm5. <-- This gets addressed in ctsm exclusively as far as I can tell.

Connected to the changes in ESCOMP/CTSM#2956 and the corresponding issue ESCOMP/CTSM#1895

See definition of DONE in the issue ESCOMP/CTSM#1895

Specific notes

Contributors other than yourself, if any:

CDEPS Issues Fixed (include github issue #):
#323
#324

Are there dependencies on other component PRs (if so list):
ESCOMP/CTSM#2956

Are changes expected to change answers (bfb, different to roundoff, more substantial):
Yes, see note in ESCOMP/CTSM#2956

Any User Interface Changes (namelist or namelist defaults changes):
Yes.

Testing performed (e.g. aux_cdeps, CESM prealpha, etc):
None, yet.

Hashes used for testing:

@slevis-lmwg
Copy link
Author

@jedwards4b
I ran ./run_sys_tests -s aux_cdeps -c /glade/campaign/cesm/cesmdata/cseg/cesm_baselines/cdeps1.0.55 --skip-generate
and got one error that seems expected, but I wanted to run it by you:

SMS_D_Ld3.f10_f10_ais8gris4_mg37.DATAMODELTEST.derecho_gnu
ERROR: Invalid compset name, DATAMODELTEST, all stub components generated

Also I didn't see a more recent baseline to compare to in cesm_baselines and did not know if I should have looked elsewhere.

@jedwards4b
Copy link
Contributor

@slevis-lmwg Yes this is an expected failure. I will generate an update to baseline tests this week, we can merge this if you are ready. Thank you for adding tests specific to this new datm mode.

@slevis-lmwg slevis-lmwg marked this pull request as ready for review February 10, 2025 16:38
@slevis-lmwg
Copy link
Author

slevis-lmwg commented Feb 10, 2025

Thanks @jedwards4b. I will discuss my corresponding CTSM mods with @ekluzek in the next day or two in order to get his comments. Meanwhile @ekluzek I'm ok with Jim merging this PR but let me know if you disagree.

@jedwards4b a heads up though: My branch here describes as cdeps1.0.61-1-g2385f03 which I think may not include the very last commit to cdeps main. Do you prefer that I handle merging main back to this branch and retesting, or is that unnecessary?

@jedwards4b
Copy link
Contributor

@slevis-lmwg I did the merge here @jedwards4b
Merge branch 'main' into mk_crujra_default
bfb435b. Did you check after pulling that change?

@slevis-lmwg
Copy link
Author

Looks good, thank you for pointing that out, I hadn't noticed that you had done that. My mods seem orthogonal to those of the merge. Since you were going to generate a new baseline, I will let you run aux_cdeps this time, and I would expect it to work fine.

@ekluzek ekluzek changed the title Make CRUJRA2024 the default datm input for clm6 Add CRUJRA2024 as an option to DATM_MODE Feb 11, 2025
@ekluzek ekluzek added enhancement New feature or request CESM Only Responsibility: CTSM Responsibility to manage and accomplish this issue is the CTSM Software group labels Feb 11, 2025
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.

@slevis-lmwg and I went over this together and we noted the things to do. I'm marking this as "requesting changes", but once the conversations are resolved this will be good to go.

datm/cime_config/config_component.xml Show resolved Hide resolved
@slevis-lmwg

This comment was marked as resolved.

@slevis-lmwg

This comment was marked as resolved.

@slevis-lmwg

This comment was marked as resolved.

@ekluzek
Copy link
Collaborator

ekluzek commented Feb 12, 2025

@slevis-lmwg you'll need to update you share version in your CTSM clone in order to use the updated form for shr_sys_abort.

@jedwards4b
Copy link
Contributor

@slevis-lmwg you just need to update the cesm_share external to share1.1.8

@slevis-lmwg
Copy link
Author

slevis-lmwg commented Feb 12, 2025

@ekluzek thank you.
I think you're saying that I do not need the "bug fix" that I introduced and, instead, I should update my /share.

If I update /share, will shr_sys_abort still work in the other components that I'm pointing to and in clm?

@jedwards4b
Copy link
Contributor

@slevis-lmwg share1.1.8 and everything should work.

@slevis-lmwg
Copy link
Author

@slevis-lmwg Yes this is an expected failure. I will generate an update to baseline tests this week, we can merge this if you are ready. Thank you for adding tests specific to this new datm mode.

Thank you, @jedwards4b
I am now ready

@jedwards4b jedwards4b requested a review from ekluzek February 14, 2025 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CESM Only enhancement New feature or request Responsibility: CTSM Responsibility to manage and accomplish this issue is the CTSM Software group
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants