merge up to ctsm-5.2.005 #4
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
Get pylint and black to pass
… in the single script
… full node of processors
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
… default jobscript name to change
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
remove unused line
updates for usermods
Make sure CESM testing compsets with cam6 forcing are being exercised. Update NoAnthro to Clm60.
…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
Fix clm6_0 defaults
samsrabin
pushed a commit
that referenced
this pull request
Sep 17, 2024
merge up to allometric modes tag, resolve conflicts
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.
This is a merge up to ctsm-5.2.005