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.009' #11

Merged

Conversation

gdicker1
Copy link

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

This PR is meant to be merged after #8

slevis-lmwg and others added 30 commits May 9, 2024 17:28
This reverts commit 371f093.

Jim Edwards posted the following in my PR:
"although you can remove cpl7 you cannot yet remove mct. However I don't
 expect you to remove any externals in this tag, I will remove them in
 the next tag."
…n subroutines, needs to add initialization of the input objects
ix clm6_0 defaults and CESM testing issues, add tests to detect these problems

Fix the clm6_0 defaults that were incorrect in ctsm5.2.0. The use-cases needed to be changed to handle clm6_0.
And clm6_0 wasn't handled in the merge of ctsm5.1.dev174 for the two new settings. Simplified the use-cases which
should help prevent these problems in the future. use_init_interp will be set for ctsm5.1 finidat files.

Fix some testing. mksurfdata_esmf and the MKSUIRFDATA test didn't work in a CESM checkout. build-namelist unit tests
weren't going over the use-cases. Also started adding some tests to go over finidat files, but didn't yet capture all of them.
Add some scripts to compare namelists in order to detect namelist issues for physics
version updates, and more easily see namelist changes in one place (bld/unit_testers/cmp_baseline_lnd_in_files,
bld/unit_testers/compare_namelists).

Add some tests to detect issues in CESM and CAM testing (add more tests for cam6.0 forcing, add new IHistClm60BgcCropG
compset). Add a NoAnthro compset to the ctsm_sci testing. Add I1850Clm60Sp test for f09 and f19 to ctsm_sci.

Change NoAnthro compsets to use RTM rather than MOSART. Add science support to some clm6_0 compsets, as was obvious.

slevis resolved conflicts:
bld/unit_testers/build-namelist_test.pl
cime_config/testdefs/ExpectedTestFails.xml
samsrabin and others added 25 commits June 27, 2024 14:22
Bring temporary branch to main-development
Make the Regular Expressions more consistent. Don't allow the use of
CLM51 for all options. Make CPLHIST CAM version depend on which
CLM version is used. Make sure explicit matches for CAM60 are there.
Add some comments to talk about what kind of land
tuning mode is being done for a section of finidat files.
…tests (as Zender won't be the option for cam7)
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
Update EarthWorksOrg/CTSM with upstream work from
ESCOMP/CESM/cesm3_0_beta02
@gdicker1 gdicker1 added the upstream Related to the upstream repo (ESCOMP/CTSM) label Aug 27, 2024
@gdicker1 gdicker1 self-assigned this Aug 27, 2024
@gdicker1 gdicker1 marked this pull request as ready for review August 29, 2024 23:38
@gdicker1 gdicker1 merged commit 72e4235 into EarthWorksOrg:ew-develop Aug 30, 2024
3 checks 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.

6 participants