Merge b4bdev 20251002 #3517
Merged
Merge b4bdev 20251002 #3517
Conversation
This file contains hidden or 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
Merge b4b-dev to master Add dask and fortls to ctsm_pylib. Fortls added for using MS VS Code there's also a .vscode directory added with a sample settings template with some recommend settings to use when using VS Code with CTSM. See the README.md file in .vscode for how to use. Dask is added to lower memory needs with chunking and also allow CTSM tools to run faster by allowing multiple threads to be used on compute. Add some more PE layouts for mpasa3p75 and tests for them to the uhr_decomp_init test list.
Merge master 20250924
Merge b4b-dev into master. Add dask and fortls to ctsm_pylib. Fortls added for using MS VS Code there's also a .vscode directory added with a sample settings template with some recommend settings to use when using VS Code with CTSM. See the README.md file in .vscode for how to use. Dask is added to lower memory needs with chunking and also allow CTSM tools to run faster by allowing multiple threads to be used on compute. Add some more PE layouts for mpasa3p75 and tests for them to the uhr_decomp_init test list.
…Init_lnd timers to around the calls rather than for the entire subroutine, because the things at the top that may abort will then have a broken timer
…etup/clean for each DecompInit test, move the decomp_mod_clean to decompMod and use it for the decompInit tests
…re each allocate has an error code handled
But, change them a bit. Conflicts: src/main/decompInitMod.F90
Conflicts: src/main/clm_initializeMod.F90
… stuff in it when use_noio is TRUE Conflicts: src/main/clm_initializeMod.F90
Conflicts: src/main/clm_initializeMod.F90
…d initialize2 calls, add timer for the InitializeRealize subroutine in this case inside of it
…d initialize2 calls, add timer for the InitializeRealize subroutine in this case inside of it
…de that does the same thing
Decompinit timer updates Merging ESCOMP#3506 was approved by @slevis-lmwg already so bypassing review here.
Add a failing test as a reminder for mosart history issue
Adjustment of albedo timestep filtering with FATES slevis resolved conflicts: cime_config/testdefs/ExpectedTestFails.xml
|
aux_clm
|
|
The test-suites are in progress, so I asked @mvdebolskiy to review/approve, with the idea that he may do so before I return to this on Friday. But it's also fine if anyone else wishes to review/approve. |
mvdebolskiy
requested changes
Oct 3, 2025
|
@mvdebolskiy are you able to approve this now? |
mvdebolskiy
approved these changes
Oct 3, 2025
|
Thank you @mvdebolskiy :-) |
ekluzek
reviewed
Oct 3, 2025
| if (clump_pproc > 0) then | ||
| nclumps = clump_pproc * npes | ||
| if (nclumps < npes) then | ||
| write(iulog,*) 'decompInit_lnd(): Number of gridcell clumps= ',nclumps, & |
There was a problem hiding this comment.
@mvdebolskiy this is the original error message, which looks like it was correct and I messed it up below. This is actually something where I couldn't add a unit test for it in #3412 because I couldn't think of a way to test for it. Which on second thought means that this is an error condition to remove.
I'll create an issue to talk about this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
New work in b4b-dev:
PR #3516 @mvdebolskiy
PR #3511 @ekluzek
Specific notes
CTSM Issues Fixed (include github issue #):
Makes visible #3494
Fixes #3387
Some work in #3448
Fixes #3508
Fixes #3509
Are answers expected to change (and if so in what way)?
No
Any User Interface Changes (namelist or namelist defaults changes)?
New test added; added same test to expected failures
Does this create a need to change or add documentation? Did you do so?
No
Testing performed, if any: