ctsm5.4.003: Merge post-5.4 to master#3655
Merged
Merged
Conversation
Derived from half-degree run started 1959-01-01, forced with CRU-JRA, at tag alpha-ctsm5.4.CMIP7.15.ctsm5.3.079. Growing seasons defined by files [sh]dates_ggcmi_crop_calendar_phase3_v1.01_nninterp-hcru_hcru_mt13.2000-2000.20230728_165845.nc. Maximum growing season length in generate_gdds.py derived from mxmat in clm60_params.crop_omni02.c251120.nc with no 'cushion'. generate_gdds.py first season 1995 and last season 2005.
Derived from half-degree run started 1959-01-01, forced with CRU-JRA, at tag alpha-ctsm5.4.CMIP7.15.ctsm5.3.079. generate_gdd20_baseline -v GDDB20 -y1 1995 -yN 2005.
…leName_gdd20_baseline.
post-5.4.n00: New crop calendar inputs and updated params (omni02)
Post 5.4 namelist updates
….85-to-post-5.4 Update 3 user_nl_clm + 2 .cfg files used in testing plus clean-up PR #3637 resolves Issue #3495 An izumi test failure Issue #3642 Add H2OSNO to fincl1 in AD and SASU modes I did some python testing in this PR. I'm saving the full ctsm5.4 testing for PR #3638, which comes next and has no planned code changes.
post-5.4.n01.alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Update post-5.4 branch to latest alpha5.4 tag
I think I'm merging what should be tag post-5.4.n01.alpha-ctsm5.4.CMIP7.21.ctsm5.3.085
Post-5.4: Fix for RRTMGP errors caused by high surface temperatures.
Contributor
Author
|
I will request reviews from all who contributed PRs to the post-5.4 branch, though I need one approval to merge. Regarding testing:
|
olyson
approved these changes
Dec 11, 2025
Contributor
olyson
left a comment
There was a problem hiding this comment.
This all looks good to me. I mainly focused on the non-namelist changes.
ekluzek
approved these changes
Dec 11, 2025
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
Update namelist_defaults:
Update default NEON inputs to v4 #3626
Update cismwrap_2_2_010 to cismwrap_2_2_011 and ccs_config_cesm1.0.61_add_domain_ne3np4.pg2_1 to ccs_config_cesm1.0.66 #3626
Remove fsat effect on baf_peatf in the fire code and update the corresponding documentation in
doc/source/tech_note/Fire/CLM50_Tech_Note_Fire.rst#3626Fix for RRTMGP errors caused by high surface temperatures #3643
Specific notes
Contributors other than yourself, if any:
@olyson @wwieder @samsrabin @ekluzek @lifang0209
CTSM Issues Fixed (include github issue #):
Fixes #3589 355+ K land temperature triggers RRTMGP error
Fixes #3598 Change default snow_thermal_cond_glc_method
Fixes #3608 Fire calibration for CLM6 release
Fixes #3594 Update NEON data to v4
Fixes #3321 Crop calendar inputs needed with CRU-JRA climate
Fixes #3658 Move c14_meshfile_none warning test to fatal error
Are answers expected to change (and if so in what way)?
Yes. Looking at aux_clm results:
Testing performed, if any:
On derecho:
OK ./build-namelist_test.pl:
<Test Id: 1291> <Desc: c14_meshfile_none>(Move c14_meshfile_none warning test to fatal error #3658 -- we fixed this)PASS make black and lint
PASS ./run_ctsm_py_tests -u and -s
OK derecho
./run_sys_tests -s aux_clm -c ctsm5.4.002 -g ctsm5.4.003OK izumi
./run_sys_tests -s aux_clm -c ctsm5.4.002 -g ctsm5.4.003 --skip-git-status