Merge b4bdev 20240307 #2416
Merged
Merge b4bdev 20240307 #2416
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
0f884bfec Merge pull request ESCOMP#205 from jedwards4b/sunset_svn_git_access 82a5edf79 merge in billsacks:svn_testing_no_github 17532c160 Use a local svn repo for testing 9c904341a different method to determine if in tests 539952ebd remove debug print statement cc5434fa7 fix submodule testing 1d7f28840 remove broken tests 04e94a519 provide a meaningful error message 38bcc0a8c Merge pull request ESCOMP#201 from jedwards4b/partial_match b4466a5aa remove debug print statement c3cf3ec35 fix issue with partial branch match git-subtree-dir: manage_externals git-subtree-split: 0f884bfec8e43d0c02261de858d6ec3f6d855e51
…o needed to update numpy version for it to work
… are main and develop, with the new externals the testlist wasn't working, it failed trying to setup cases
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)
Merge ctsm5.1.dev169 back into b4b-dev
The former is now breaking my ability to build the docs in VSCode. It seems to have no impact on the ability to build the docs using the Docker method.
Minor docs updates
Should have no effect if it's already initialized, except some extra verbosity.
…D gnu, use one or the other, roughly alturnate between them
…it-lfs Do "git lfs install" in "make fetch-images", and fix tillage instructions
Update externals to what is expected to be in cesm2_3_beta17 fix some conda issues...
* Correction: 50% of residues are now removed, not 0. * Removes huge table that can be summarized as "0.7 for biofuel crops and 0 for everything else."
…-50pct Explain choice of 50% for residue removal
Set initial t_soisno=272K for soils and 274K for urban road
…ot really needed this resolves ESCOMP#2412
ekluzek
added
enhancement
…the temporary directory, this is handling for ESCOMP#2405
samsrabin
approved these changes
Mar 10, 2024
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
Update of externals to what's expected in cesm2_3_beta17. Some documentation updates including a rebuild
of the documentation and updating how images are handled with git lfs. Improvements to the documentation for
residue removal and tillage for prognostic crops.
#2396
#2385
#2394
#2389
Specific notes
Contributors other than yourself, if any: @samrabin @ekluzek
CTSM Issues Fixed (include github issue #):
Fixes #2351
Fixes #2380
Fixes #2331
Fixes #1910
Fixes #1658
Fixes #2412
Are answers expected to change (and if so in what way)? No bit-for-bit
Any User Interface Changes (namelist or namelist defaults changes)? No
Testing performed, if any: regular testing, build-namelist, python
Testing as expected. With only one test failing compared to the baseline because of missing files in the baseline
FAIL SMS_D_Lm1_Mmpi-serial.CLM_USRDAT.I1PtClm50SpRs.derecho_intel.clm-USUMB_nuopc BASELINE ctsm5.1.dev171: ERROR BFAIL some baseline files were missing