Repository navigation
ctsm5.4.062: Merge b4bdev 20261001 - #4241
Merged
Merged
Conversation
…_eff to frac_sno_fluxes
…le renaming)
- Rename subroutine CalcFracSnoEff -> CalcFracSnoFluxes and all caller sites
across SnowCoverFractionBaseMod, LakeHydrologyMod, SnowCoverFractionNiuYang2007Mod,
and SnowCoverFractionSwensonLawrence2012Mod.
- Standardize variable comments for frac_sno_albedo ("fraction of ground covered by snow
for albedo calculations (0 to 1)") and frac_sno_fluxes ("fraction of ground covered by
snow for heat flux calculations (0 to 1)") across all modified modules.
- Audit and fix comment inaccuracies in SoilHydrologyMod (fsno copy of frac_sno_fluxes),
SnowHydrologyMod (dz scaling by frac_sno_fluxes), SurfaceWaterMod (updating both
frac_sno_albedo and frac_sno_fluxes), SoilTemperatureMod, and clm_driver.
- Remove outdated TODO comment in SnowHydrologyMod referencing CanopyHydrologyMod.
- Re-align Fortran pointer associations and assignments across modified files.
…tes submodule pointer - Align '=' on line 826 of BalanceCheckMod.F90 to column 42. - Reset src/fates submodule pointer back to sci.1.92.7_api.46.0.0 (121723f6).
…and align associate pointers
…sno_* variable declarations
…no_(albedo|fluxes) pattern and comment descriptions Assisted-by: gemini-3-pro-preview
Merge b4b-dev to master Brings in complete CLM-U tech note. Some refactoring simlplications to compsets and FATES paramgen tests. Improves error messaging in code for history and adds a warning for hillslope. Put comments in testlist into one line (so you see all the comments when using query_testlist). Simplify compsets - Merge multiple test-comments into single comments in testlist - Import CLM-U tech note from Word into the CTSM Tech Note. - No longer need to allow for C/E at end of time period (changes to CAM and CESM required for this are already in CESM tags) - Improve history restart error messages - Simplify FATES paramgen in tests (ncgen no longer needed), get it to work in both CESM and CTSM checkouts - Adds warning when use_init_interp is used with hillslope
Merge tag 'ctsm5.4.058' into b4b-dev
…E_test slevis resolved conflicts: cime_config/testdefs/ExpectedTestFails.xml cime_config/testdefs/testmods_dirs/clm/DA_multidrv/shell_commands cime_config/testdefs/testmods_dirs/clm/pauseResume/shell_commands
Change GLC_NCPL to 4 for DAE test to pass
… siblings do Have one test case pass 'testing=true' into setup_files(), like its siblings already do, so that it skips checking for a specific /glade file. Assisted-by: gemini-3.8-flash:1.0
run_ctsm_py_tests.py called pytest.main() without passing its return code on, so ./run_ctsm_py_tests exited 0 even when tests failed or collection was interrupted, and the python-unit-tests job could not go red. That job also checked out without the cime submodule and without the Git LFS test inputs. Test modules that import CIME failed at collection, pytest stopped before running any test, and the netCDF inputs were LFS pointer files. Check out with lfs: true and run bin/git-fleximod update cime, as docs-common.yml does for the docs build. See ESCOMP#4230.
test(subset_data): make unit test work outside NCAR cluster, like its siblings do
…fail-on-failure Make the Python unit-test job fail when a test fails
Make additional history fields active in prep. for CMIP7
slevis resolved conflicts: cime_config/testdefs/ExpectedTestFails.xml
slevis-lmwg
moved this from Ready to start (or start again)
to In progress - master
in CTSM: Upcoming tags
slevis-lmwg
marked this pull request as ready for review
October 1, 2026 22:28
wwieder
approved these changes
Oct 2, 2026
github-project-automation
Bot
moved this from Stalled (needs review, blocked etc.)
to In progress - master
in CTSM: Upcoming tags
github-project-automation
Bot
moved this from In progress - master
to Done (non release/external)
in CTSM: Upcoming tags
github-project-automation
Bot
moved this from Stalled
to Done
in LMWG: Sprint Planning Board
slevis-lmwg
added a commit
that referenced
this pull request
Oct 2, 2026
Merge b4bdev 20261001 PR #4241 for details
rgknox
added a commit
to rgknox/ctsm
that referenced
this pull request
Oct 12, 2026
Merge b4bdev 20261001 PR ESCOMP#4241 for details
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 these PRs
#4199 Make additional history fields active in prep. for CMIP7
#4236 Make the Python unit-test job fail when a test fails
#4231 test(subset_data): make unit test work outside NCAR cluster, like its siblings do
#4229 Specify q10 for HR and MR
#4185 refactor(biogeophys): Rename frac_sno and frac_sno_eff to clarify albedo vs flux roles
#4225 Fix test_unit_neon_site error
#4222 Fix test_sys_plumber2_surf_wrapper.py failures
#4220 Change GLC_NCPL to 4 for DAE test to pass
Specific notes
Contributors other than yourself, if any:
@Santoshkumarpuppala
@johnpaulalex
@wwieder
@olyson
CTSM issues resolved or otherwise addressed, if any:
Resolves #4181
Resolves #4230 Contributes to #3236
Resolves #4196
Resolves #822
Resolves #4216
Resolves #4215
Resolves #4202
Any user interface changes (namelist or namelist defaults changes)?
Testing planned or performed, if any:
./run_sys_tests -s aux_clm -c ctsm5.4.061 -g ctsm5.4.062Requirements before merge: