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

Update with tag 'ctsm5.2.007' #8

Merged

Conversation

gdicker1
Copy link

@gdicker1 gdicker1 commented Aug 20, 2024

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

ekluzek and others added 30 commits April 10, 2024 18:31
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
@gdicker1 gdicker1 added the upstream Related to the upstream repo (ESCOMP/CTSM) label Aug 20, 2024
@gdicker1 gdicker1 self-assigned this Aug 20, 2024
@gdicker1 gdicker1 changed the base branch from ew-main to ew-develop August 20, 2024 23:45
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
…OMP/ctsm into 'ew-develop'"

This reverts commit e06be95, reversing
changes made to 158a7c7.

Since the branch_tags/CESM3_dev.n04_ctsm.1.dev145 isn't incorporated
into the ESCOMP/CTSM master branch, keeping these changes cause
issues when trying to update with more recent CTSM tags.
…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
@gdicker1 gdicker1 force-pushed the update/cesm3_0_beta01/ctsm5.2.007 branch from 76e7395 to 8be5109 Compare August 22, 2024 19:49
@gdicker1
Copy link
Author

gdicker1 commented Aug 22, 2024

Note this force-push (76e7395 to 8be5109 ) is because PR #10 has replaced PR #5 .

@gdicker1 gdicker1 marked this pull request as ready for review August 24, 2024 00:20
@gdicker1 gdicker1 merged commit 38b810e into EarthWorksOrg:ew-develop Aug 29, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
upstream Related to the upstream repo (ESCOMP/CTSM)
Projects
None yet
Development

Successfully merging this pull request may close these issues.