Merge ctsm5.1.dev169 into hillslope_hydrology #10
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
…r2212 Merge tag: Turn on Meier2022, tillage, residue removal; bring in ESCOMP#2212
Do not crash "make all" even if pylint isn't clean
Resolve pylint issues in python/ctsm/.
… to derecho_gnu. derecho_intel doesn't currently work with debug mode on.
…derecho Move FSURDATMODIFYCTSM test to Derecho
Delete history and spurious _FillValue from parameter files
Do not allow negative snocan in a part of the code that triggers the error reported in issue ESCOMP#2366.
Remove a case of negative snocan in CanopyFluxesMod to resolve ESCOMP#2366 One-line change that now includes "max(0._r8," to prevent negative snocan in that part of the code.
Brings in 3 PRs from b4b-dev to master: - Do not crash "make all" even if pylint isn't clean (ESCOMP#2353; Sam Rabin) - Resolve pylint issues (ESCOMP#2354; Sam Rabin) - Move FSURDATMODIFYCTSM test to Derecho (ESCOMP#2364; Sam Rabin)
Merge pull request ESCOMP#2382 from samsrabin/merge-b4bdev-20240222 Brings in 3 PRs from b4b-dev to master: - Do not crash "make all" even if pylint isn't clean (ESCOMP#2353; Sam Rabin) - Resolve pylint issues (ESCOMP#2354; Sam Rabin) - Move FSURDATMODIFYCTSM test to Derecho (ESCOMP#2364; Sam Rabin)
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.
I've done the aux_clm testing and everything looks good. When you approve this, we should be able to bring it in to the main CTSM branch!