Merge b4b-dev 2024-02-22 #2382
Merged
Merge b4b-dev 2024-02-22 #2382
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
Includes adding a timeout of 60 seconds for requests.get().
Moves some functions from there into 3 new modules: * ctsm/crop_calendars/check_constant_vars.py * ctsm/crop_calendars/check_rx_obeyed.py * ctsm/crop_calendars/convert_axis_time2gs.py
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
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.
ekluzek
approved these changes
Feb 22, 2024
samsrabin
added a commit
to samsrabin/CTSM
that referenced
this pull request
Feb 22, 2024
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)
samsrabin
added a commit
to samsrabin/CTSM
that referenced
this pull request
Feb 25, 2024
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)
olyson
added a commit
to olyson/ctsm
that referenced
this pull request
Feb 28, 2024
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.
Description of changes
Brings in three PRs from b4b-dev to master:
Specific notes
Contributors other than yourself, if any: None
CTSM Issues Fixed (include github issue #):
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)? No
Testing performed, if any:
aux_clmtesting OK; generatedctsm5.1.dev169baselinesmake all(black, pylint, Python unit/system tests) passes