forked from ESCOMP/CTSM
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Update with tag 'ctsm5.2.007' #8
Merged
gdicker1
merged 2,031 commits into
EarthWorksOrg:ew-develop
from
gdicker1:update/cesm3_0_beta01/ctsm5.2.007
Aug 29, 2024
Merged
Update with tag 'ctsm5.2.007' #8
gdicker1
merged 2,031 commits into
EarthWorksOrg:ew-develop
from
gdicker1:update/cesm3_0_beta01/ctsm5.2.007
Aug 29, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge b4b-dev Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml bld/namelist_files/namelist_defaults_overall.xml bld/namelist_files/namelist_definition_ctsm.xml bld/unit_testers/build-namelist_test.pl cime_config/config_component.xml cime_config/testdefs/testlist_clm.xml doc/ChangeLog doc/ChangeSum
…odev176 Conflicts: cime_config/config_component.xml doc/ChangeSum
From @slevis-lmwg suggestion. Co-authored-by: Samuel Levis <slevis@ucar.edu>
Update namelist with needed cam4.0, cam5.0, and clm6_0 changes so that the namelist tester works and compares as expected to the previous version.
for ctsm_sci tests with the updated default PE layouts we have in place.
Merging b4b-neon instead of b4b-dev because I expect to push b4b-neon to b4b-dev soon
B4b neon Description Fixes neon bugs related to calendar issue with transient cases created by run_neon and an odd error that can be fixed by removing redundant information in usermod_dirs. CTSM Issues Fixed: Fixes ESCOMP#2470 Fixes ESCOMP#2471 Fixes ESCOMP#2474 Are answers expected to change (and if so in what way)? No, removes bug in NEON cases Any User Interface Changes (namelist or namelist defaults changes)? only changes to usermod_dirs Testing: OK: ./run_ctsm_py_tests -u OK: ./run_ctsm_py_tests -s PASS: ./run_sys_tests -s clm_pymods -c ctsm5.1.dev176 --skip-generate
adding lai_dtlimit to namelist & updating usermods for PLUMBER
… into ctsm5.2.007/candidate slevis resolved conflicts: README
git-subtree-dir: .lib/git-fleximod git-subtree-split: a354b05
Remove manage externals and update documentation accordingly
This reverts commit 7d59d3a. Faulty commit that has made staying up-to-date with ESCOMP/CTSM harder.
Update EarthWorksOrg/CTSM with upstream work from ESCOMP/CESM/cesm2_3_beta17
Update EarthWorksOrg/CTSM with upstream work from ESCOMP/CESM/cesm2_3_beta17
Update EarthWorksOrg/CTSM with upstream work from ESCOMP/CESM/cesm2_3_beta17
…into update/cesm2_3_beta17/ctsm5.2.005-2 Prepare this branch to merge into 'ew-develop' in EarthWorksOrg/CTSM
Update EarthWorksOrg/CTSM with upstream work on the way to ESCOMP/CESM/cesm3_0_beta01
Update EarthWorksOrg/CTSM with upstream work from ESCOMP/CESM/cesm3_0_beta01
76e7395
to
8be5109
Compare
This was referenced Aug 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Advance EarthWorksOrg/CTSM to include changes from the ESCOMP/CTSM 'ctsm5.2.007' tag. This matches with updates of other externals to what's used in ESCOMP/CESM tag 'cesm3_0_beta01'
This PR is meant to be merged after
#7#10