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

Remove Clm51 references throughout or change to Clm60 #2808

Merged
merged 12 commits into from
Oct 24, 2024

Conversation

slevis-lmwg
Copy link
Contributor

@slevis-lmwg slevis-lmwg commented Oct 2, 2024

Description of changes

TODO list appears in the corresponding issue #2379.

Specific notes

Contributors other than yourself, if any:
@ekluzek

CTSM Issues Fixed (include github issue #):
Most of what's need in #2379
Resolves #2561
CMEPS, CISM and mizuRoute still need to be updated for #2379 to be finalized

Are answers expected to change (and if so in what way)?
No.

Any User Interface Changes (namelist or namelist defaults changes)?
Removing Clm51 references throughout.

Does this create a need to change or add documentation? Did you do so?
Yes.

Testing performed, if any:
On derecho:

  • PASS make black and make lint
  • PASS ./run_ctsm_py_tests -s and ./run_ctsm_py_tests -u
  • PASS ./build-namelist_test.pl
  • OK aux_clm without mods to the submodules, yet

@slevis-lmwg slevis-lmwg self-assigned this Oct 2, 2024
@slevis-lmwg slevis-lmwg added the bfb bit-for-bit label Oct 2, 2024
@slevis-lmwg slevis-lmwg changed the base branch from master to cesm3_0_beta04_changes October 7, 2024 21:00
@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Oct 7, 2024

OK aux_clm on derecho before rebasing from master to the cesm3_0_beta04_changes branch.

After rebasing to the cesm3_0_beta04_changes branch:
OK aux_clm on derecho
OK aux_clm on izumi
PASS make black and make lint
PASS ./run_ctsm_py_tests -u and ./run_ctsm_py_tests -s
PASS ./build-namelist_test.pl (still running, but I expect this to pass)

This PR is ready to merge. I need to wait for @ekluzek's review and approval, especially due to the potential for conflicts as mentioned in this post.

@slevis-lmwg slevis-lmwg marked this pull request as ready for review October 8, 2024 18:09
@slevis-lmwg slevis-lmwg requested a review from ekluzek October 8, 2024 18:49
@slevis-lmwg slevis-lmwg removed the request for review from ekluzek October 12, 2024 00:33
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 and we have a couple changes to make. But, he will make those and then bring this in.

As a final thing to do do a
git grep -i clm5_1
git grep -i Clm51
git grep -i clm5.1

and make sure everthing is handled. We did this before and we thought it was, but good to make sure again.

bld/unit_testers/build-namelist_test.pl Show resolved Hide resolved
bld/unit_testers/build-namelist_test.pl Show resolved Hide resolved
cime_config/testdefs/testlist_clm.xml Outdated Show resolved Hide resolved
cime_config/testdefs/testlist_clm.xml Outdated Show resolved Hide resolved
@ekluzek ekluzek added this to the cesm3_0_beta05 milestone Oct 21, 2024
slevis resolved conflicts:
bld/namelist_files/namelist_defaults_ctsm.xml
cime_config/testdefs/ExpectedTestFails.xml
@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Oct 22, 2024

Testing before merging

Derecho
PASS ./build-namelist_test
PASS python testing
OK ctsm_sci
OK aux_clm (rerunning all)

Izumi
OK aux_clm (rerunning all)

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Oct 24, 2024

ESCOMP@bae4c64
I made the change to get the tests to pass originally.
Turns out issue ESCOMP#2784 will resolve the failures, so this time I added the
four tests to ExpecedTestFails.xml
@slevis-lmwg slevis-lmwg merged commit 8a019d9 into ESCOMP:cesm3_0_beta04_changes Oct 24, 2024
2 checks passed
@slevis-lmwg slevis-lmwg deleted the clm51_to_60 branch October 24, 2024 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bfb bit-for-bit
Projects
None yet
2 participants