Repository navigation
Merge b4bdev 20261029 - #4290
Merged
Merged
Conversation
…ge the NOTE into a {hint}
If git isn't going to check out a submodule, it still creates the submodule directory (apparently to reserve it, in case you check it out later). So we can't simply check for existence of a subdir to verify submodule, we need to look for files in it. Added unit test coverage in test_unit_path_utils.py.
- lilac_make_runtime_inputs was missing the add_cime_to_path that all the other scripts already have, to find CIME. - subset_data: resolve user_nl_clm from CTSM root and user_nl_datm_streams from enclosing CESM root (if present) in setup_user_mods(). Added unit tests too.
…CESM layouts Help two tests work in CESM as well as CTSM: - test_unit_sspmatrix.py is the sole caller of path_utils' add_ctsm_systests_to_path(), to find cime_config (within CTSM). Fixed that method to find CTSM in either scenario. - test_sys_lilac_build_ctsm: needs to find CIME, now calls add_cime_lib_to_path
…from any directory The short config modify_fsurdat_short.cfg points to a checked-in .nc file via a relative path, relative to CTSM/python/. That relative path only resolves correctly when the script is run from that python/ subdir. To fix it, we use the same search-and-replace pattern that the other tests do, to replace the relative path with an absolute path.
check-compset-aliases.sh wrapped each grep pattern in literal double quotes (\"$ALIAS\" inside $(...)), so the --fixed-strings greps matched nothing and the check passed any config_compsets.xml. 90c3321 also dropped --invert-match from the last grep of check_missing_alias_matches, which the quoting hid. check-testlists.yml filtered on paths that do not exist (add_supertestlists, cime_config/ without testdefs/), so the job never ran, and cd'd into cime_config/testdef. Fix the paths and the directory, and add the workflow file to its own paths. Fixes ESCOMP#4214
…get a monthly climatology of daily CPLHIST data for aerosols
…neral changes from looking at our other bash scripts, one of which is handling abort on either killing the batch job, or hitting Ctrl-C when running interactive
…es, and remove the specific one for mksurfdata_esmf
…directory structure and checking, I ran the new script for b.e30_alpha09e_m.B1850C_MTso_Gris_Marbl years 100-130 and the answers were identical to the shell script
…sts, and if monthly files already exist use them rather than overwritting
…carefully examined it's description of what it did and why, as well as the final code changes
…adata around for clarity and ordering
…path fix(python): resolve submodule paths and support nested CESM checkouts (resolves ESCOMP#2658, ESCOMP#3552)
…m with a more generic base class, and the specific application for aerosols on top as a seperate wrapper, this is what it gave me, the tests all work, and black and pylint is clean
…m_script Add a script to create Aerosol monthly climatology from CPLHIST daily data to use for CESM3/CMIP7 1850 simulations
…ates Fix quoting in check-compset-aliases.sh and paths in check-testlists.yml
…s-casper.md review suggestion to add here. Co-authored-by: Sam Rabin <samrabin@ucar.edu>
…s-casper.md Another review suggestion to shorten the hint. Co-authored-by: Sam Rabin <samrabin@ucar.edu>
Update on demand notes
Consolidate introductory urban chapters and figures in the technical note
ekluzek
approved these changes
Oct 30, 2026
ekluzek
left a comment
Contributor
There was a problem hiding this comment.
LGTM
A lot of good things coming in. Some of it's my stuff which I can't really review, but I recognize it.
Member
|
Failure of "Docs dependency update tests / Are both methods identical?" test is expected and can be ignored. |
slevis-lmwg
added a commit
that referenced
this pull request
Oct 30, 2026
Merge b4b-dev 20261029 Developers who run python system tests need to update to the new ctsm_pylib coming in with this PR for all tests to pass. Details about everything updated in PR #4290.
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
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
Includes PRs
#4270 Consolidate introductory urban chapters and figures in the technical note
#4190 Update on demand notes
#4247 Fix quoting in check-compset-aliases.sh and paths in check-testlists.yml
#4257 Add a script to create Aerosol monthly climatology from CPLHIST daily data to use for CESM3/CMIP7 1850 simulations
#4207 fix(python): resolve submodule paths and support nested CESM checkouts (resolves #2658, #3552)
#4172 fix(biogeophys): Correct diagnostic array initialization for exact restarts
#4278 add comments for frozen_q10
Specific notes
Contributors other than yourself, if any:
@olyson
@ekluzek
@Santoshkumarpuppala
@johnpaulalex
@wwieder
CTSM issues resolved or otherwise addressed, if any:
#4270 contributes to #3819
#4190 resolves #4028
#4247 resolves #4214
#4257 resolves #4284 and #4285
#4207 resolves #2658 and #3552
#4172 resolves #4142 and #3661
#4278 resolves #4277
Any user interface changes (namelist or namelist defaults changes)?
Testing planned or performed, if any:
./run_sys_tests -s aux_clm -c ctsm5.4.066 -g ctsm5.4.067Requirements before merge: