Merge up to ctsm5.2.006 and deconflict #5
Merged
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
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."
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
Update Externals.cfg to cesm2_3_beta17, remove mct, retire /test/tools
Update externals to cesm2_3_beta17, remove mct, retire /test/tools Changes unrelated to the tag's title:
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.
Minor deconflict in the build namelist unit tests.