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.005' #7

Closed

Conversation

gdicker1
Copy link

@gdicker1 gdicker1 commented Aug 20, 2024

Advance EarthWorksOrg/CTSM to include changes from the ESCOMP/CTSM 'ctsm5.2.005' tag. This matches with updates of other externals to what's used in ESCOMP/CESM tag 'cesm2_3_beta17'

NOTE: Unless the repo changes, this PR will be merged by fast-forward. This goes against the preferred style since this PR already involves a merge onto the ew-develop branch

ekluzek and others added 30 commits March 27, 2024 00:22
Get pylint and black to pass
Add a couple features from multi over to single, so that multi can use the same code.
…le not having to test both, which allows the SystemTest to be valid for just using the single script
Merge ctsm5.2 branch up to ctsm5.1.dev174
Merge b4bdev 20240321

 Conflicts:
	.git-blame-ignore-revs
updating input data file paths
…tests for ctsm5.2, that were removed in the update
Update to ctsm5.1.dev174

Update to newer tag. Which also includes an externals
update which broke the build/run of mksurfdata_esmf.
As a result I added some additional unit-testing in
order to detect this sort of thing sooner.

 Conflicts:
	bld/namelist_files/namelist_defaults_ctsm.xml
	bld/unit_testers/build-namelist_test.pl
Update ctsm5.2 branch to ctsm5.1.dev175
Merge up to ctsm5.1.dev175

Merge up to ctsm5.1.dev175 and do standard aux_clm testing.

 Conflicts:
	bld/unit_testers/build-namelist_test.pl
ekluzek and others added 21 commits May 9, 2024 02:05
…se of a problem in the use-case changes I made
CTSM5.2 1979 fsurdat and 1979-2026 landuse ne0np4 files + 2 fixes
CTSM5.2 1979 fsurdat and 1979-2026 landuse ne0np4 files + two fixes

Includes work by multiple people:
@slevis-lmwg: new fsurdat/landuse files and corresponding infrastructure for
the three so-called VR grids (ne0np4)
@samsrabin: a subset_data fix
@olyson: corrections to a couple of history long-names and updates to
history_fields_fates.rst and history_fields_nofates.rst
Use ne30np4.pg3_gx1v7 BgcCrop GSWP3v1
finidat file for 1850 clm5_1 and clm6_0.
…o match how the finidat matching is done so that it now works
Update EarthWorksOrg/CTSM with upstream work from
ESCOMP/CESM/cesm2_3_beta17
@gdicker1 gdicker1 self-assigned this Aug 20, 2024
@gdicker1 gdicker1 added the upstream Related to the upstream repo (ESCOMP/CTSM) label Aug 20, 2024
@gdicker1 gdicker1 changed the base branch from ew-main to ew-develop August 20, 2024 21:57
@gdicker1 gdicker1 changed the title Update/cesm2 3 beta17/ctsm5.2.005 Update with tag 'ctsm5.2.005' Aug 20, 2024
@gdicker1
Copy link
Author

This PR is being closed. Due to PR #4 , the branch needs to be reconsidered.

The branch merged in PR #4 (branch_tags/CESM3_dev.n04_ctsm5.1.dev145) has not been incorporated into the master branch of ESCOMP/CTSM. This causes issues when trying to merge in newer tags (e.g. ctsm5.2.005) and needs to be reverted.

@gdicker1 gdicker1 closed this Aug 22, 2024
@gdicker1
Copy link
Author

Superseded by #10

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.