Skip to content

ctsm5.4.000: Alpha ctsm5.4.cmip7 to master#3638

Merged
slevis-lmwg merged 187 commits into
masterfrom
alpha-ctsm5.4.CMIP7
Dec 5, 2025
Merged

ctsm5.4.000: Alpha ctsm5.4.cmip7 to master#3638
slevis-lmwg merged 187 commits into
masterfrom
alpha-ctsm5.4.CMIP7

Conversation

@ekluzek
Copy link
Copy Markdown
Contributor

@ekluzek ekluzek commented Nov 27, 2025

Description of changes

This brings the ctsm5.4 alpha branch to master.

This updates ALL of the surface and landuse timeseries datasets to version ctsm5.4
It's backwards compatible with ctsm5.3 datasets though, so older ctsm5.3 files can be used
Future scenarios are done using the cmip6 ctsm5.3 surface datasets. The new XML variable
CLM_CMIP_ERA controls this.

A few other updates come in as well for clm6_0:
Initial Condition (IC) files
New parameter file
New crop calendar datasets
Changes to fire parameters
New population density file

Specific notes

Contributors other than yourself, if any: @slevis-lmwg @wwieder @olyson @samsrabin @lawrencepj1 @lifang0209
@slevis-lmwg did the great bulk of the work here

CTSM Issues Fixed (include github issue #):
A list of issues apply here

Are answers expected to change (and if so in what way)? Yes! New surface datasets means everything will be different

Any User Interface Changes (namelist or namelist defaults changes)? Yes defaults updates

All fsurdat and flanduse_timeseries files updated
Fire parameters update: (li2024gswp3, and li2024crujra fire_method):
- defo_fire_precip_thresh_bet
- cli_scale
- cropfire_a1
IC files: clm6_0 finidat files
IC Interpolation: use_init_interp and init_interp_attributes, init_interp_fill_missing_urban_with_HD==TRUE
Parameter file update, clm6_0
Crop Calendar files updated: stream_fldfilename_cultivar_gdds
Population density updated:

New XML variable added: CLM_CMIP_ERA (cmip6 or cmip7)

SSP Future scenarios can only be run with cmip6 surface/landuse.timeseries datasets

Does this create a need to change or add documentation? Did you do so? Yes Yes at least some updates

Testing performed, if any: Previous alpha tags have had the following test lists run:
aux_clm ctsm_sci mosart rtm fates

lifang0209 and others added 30 commits May 30, 2025 10:13
slevis resolved conflicts:
tools/mksurfdata_esmf/src/mkagfirepkmonthMod.F90
…k_ctsm54_datasets

slevis resolved conflicts:
tools/mksurfdata_esmf/gen_mksurfdata_namelist.xml
…esmf

Include abm = 13 values when determining dominant abm in mksurfdata_esmf
Merge b4b-dev to master

slevis resolved conflicts:
tools/mksurfdata_esmf/gen_mksurfdata_namelist.xml
Merge master to alpha-ctsm5.4.CMIP7

New tag alpha-ctsm5.4.CMIP7.03.ctsm5.3.063
Update everything needed to make ctsm54 datasets.
Urban mesh was pointing to a 3x3min instead of a 0.25x0.25 file
…duse

Add ctsm54 ne30, f09, f19 fsurdat/landuse files to namelist defaults
@ekluzek ekluzek added test: docs Test documentation build before merging test: PFUNIT Pass FUNITCTSM tests before merging labels Nov 27, 2025
@ekluzek ekluzek moved this from Ready to start (or start again) to In progress - master in CTSM: Upcoming tags Nov 27, 2025
@ekluzek ekluzek moved this from Todo to In Progress in LMWG: Sprint Planning Board Nov 27, 2025
Comment thread .gitmodules
Comment thread cime_config/testdefs/ExpectedTestFails.xml Outdated
Comment thread cime_config/testdefs/ExpectedTestFails.xml Outdated
Comment thread cime_config/testdefs/ExpectedTestFails.xml Outdated
alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Three user_nl_clm and two .cfg files with ctsm5.4 updates
@slevis-lmwg
Copy link
Copy Markdown
Contributor

slevis-lmwg commented Dec 3, 2025

Testing

NOTE: I see us possibly renaming the baselines. For now, I named them by the tag that ran them.

  • derecho
OK ./build-namelist_test.pl
PASS make black and lint
PASS python -u and -s
OK ./run_sys_tests -s aux_clm -c ctsm5.3.085 -g alpha-ctsm5.4.CMIP7.21.ctsm5.3.085
OK ./run_sys_tests -s ctsm_sci -c ctsm_sci-alpha-ctsm5.4.CMIP7.19.ctsm5.3.082 -g ctsm_sci-alpha-ctsm5.4.CMIP7.21.ctsm5.3.085
OK ./run_sys_tests -s fates -c fates-sci.1.88.0_api.42.0.0-ctsm5.3.083 -g fates-sci.1.88.0_api.42.0.0-alpha-ctsm5.4.CMIP7.21.ctsm5.3.085    
OK ./run_sys_tests -s rtm -c rtm1_0_89-ctsm5.3.065 -g rtm1_0_89-alpha-ctsm5.4.CMIP7.21.ctsm5.3.085
OK ./run_sys_tests -s mosart -c mosart1.1.12-ctsm5.3.066 -g mosart1.1.12-alpha-ctsm5.4.CMIP7.21.ctsm5.3.085

I confused myself:
This seemed wrong COMP: paramfile = clm60_params.ctsm6_li2024.c250822.nc'
...but ctsm5.4 is not getting the final clm6 paramfile that appears in the post-5.4 branch!

Checking mosart with
./cs.status.fails | grep -v NLCOMP | grep -v 'me baseline files were mi' | grep -v '66: DI'

  • izumi IN PROGRESS
OK ./run_sys_tests -s aux_clm -c ctsm5.3.085 -g alpha-ctsm5.4.CMIP7.21.ctsm5.3.085
OK ./run_sys_tests -s fates -c fates-sci.1.88.0_api.41.0.0-ctsm5.3.082 -g fates-sci.1.88.0_api.42.0.0-alpha-ctsm5.4.CMIP7.21.ctsm5.3.085
OK ./run_sys_tests -s rtm -c rtm1_0_89-ctsm5.3.065 -g rtm1_0_89-alpha-ctsm5.4.CMIP7.21.ctsm5.3.085
OK ./run_sys_tests -s mosart -c mosart1.1.12-ctsm5.3.066 -g mosart1.1.12-alpha-ctsm5.4.CMIP7.21.ctsm5.3.085

@slevis-lmwg
Copy link
Copy Markdown
Contributor

@ekluzek testing has finished successfully. Let's look at this together in prep. for merging to master.

@slevis-lmwg
Copy link
Copy Markdown
Contributor

slevis-lmwg commented Dec 4, 2025

  • update changelog/sum, mainly what changes from ctsm5.3.085 to ctsm5.4 (did we decide to omit the 000?)
  • rename all the baselines? Not done, but conversation in progress.

@ekluzek ekluzek marked this pull request as ready for review December 4, 2025 22:30
Copy link
Copy Markdown
Contributor Author

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, it's really nice to be at this point!

I have a bunch of suggestions for the ChangeLog. We'll go over this together. And we should have you approve the PR since I created it.

Comment thread doc/ChangeLog Outdated
Comment thread doc/ChangeLog Outdated
Comment thread doc/ChangeLog Outdated
Comment thread doc/ChangeLog
Comment thread doc/ChangeLog
Comment thread doc/ChangeLog
Comment thread doc/ChangeLog
Comment thread doc/ChangeLog
Comment thread doc/ChangeLog
Comment thread bld/namelist_files/namelist_defaults_ctsm.xml
samsrabin added a commit to samsrabin/CTSM that referenced this pull request Dec 4, 2025
….85-to-post-5.4

Update 3 user_nl_clm + 2 .cfg files used in testing plus clean-up

PR ESCOMP#3637 resolves
Issue ESCOMP#3495 An izumi test failure
Issue ESCOMP#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 ESCOMP#3638, which comes next and has no planned code changes.
Copy link
Copy Markdown
Contributor

@slevis-lmwg slevis-lmwg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had one last review meeting with @ekluzek and agreed that this is ready for approval.

@slevis-lmwg slevis-lmwg merged commit b1e8e03 into master Dec 5, 2025
11 checks passed
@github-project-automation github-project-automation Bot moved this from In Progress to Done in LMWG: Sprint Planning Board Dec 5, 2025
@github-project-automation github-project-automation Bot moved this from In progress - master to Done (non release/external) in CTSM: Upcoming tags Dec 5, 2025
samsrabin added a commit to samsrabin/CTSM that referenced this pull request Dec 5, 2025
Merge alpha-ctsm5.4.CMIP7 to master

PR ESCOMP#3638
Issue ESCOMP#2851 Update to CMIP7 LULCC forcings (umbrella issue with the main ctsm5.4 checklist)

Summary from the ChangeLog
--------------------------
 Merging alpha-ctsm5.4.CMIP7 to master in preparation for the official ctsm5.4 release.

 WhatsNewInCTSM5.4.md documents the updates from ctsm5.3.021 (the official ctsm5.3 release) to present and will be updated with the exact ctsm5.4 release tag in the near future, once we identify such tag.

 Here we summarize updates from ctsm5.3.085 (the most recent tag) to ctsm5.4.000 (the current tag):
 - Updating ALL the fsurdat/landuse files to version ctsm5.4, though this version is backwards compatible with ctsm5.3 datasets, so ctsm5.3 files can still be used.
 - Updating "agricultural fire peak month" raw dataset, as well as the algorithm determining this field's dominant values in mksurfdata_esmf
 - Future scenarios are done using the cmip6 ctsm5.3 surface datasets. The new XML variable CLM_CMIP_ERA controls this.
 - A few other updates come in as well for clm6_0:
   * New Initial Condition (IC) files
   * New parameter file
   * New crop calendar datasets
   * Changes to fire parameters along with new fire_method "li2024crujra"
   * New population density file

Contributors: Sam Levis, Peter Lawrence, Erik Kluzek, Will Wieder, Keith Oleson, Sam Rabin, Fang Li

See the ChangeLog for notes relevant to users and developers, for testing, for answer changes and pertinent simulations, and for submodule updates.
ekluzek added a commit to ekluzek/CTSM that referenced this pull request Dec 5, 2025
Merge alpha-ctsm5.4.CMIP7 to master

PR ESCOMP#3638
Issue ESCOMP#2851 Update to CMIP7 LULCC forcings (umbrella issue with the main ctsm5.4 checklist)

Summary from the ChangeLog
--------------------------
 Merging alpha-ctsm5.4.CMIP7 to master in preparation for the official ctsm5.4 release.

 WhatsNewInCTSM5.4.md documents the updates from ctsm5.3.021 (the official ctsm5.3 release) to present and will be updated with the exact ctsm5.4 release tag in the near future, once we identify such tag.

 Here we summarize updates from ctsm5.3.085 (the most recent tag) to ctsm5.4.000 (the current tag):
 - Updating ALL the fsurdat/landuse files to version ctsm5.4, though this version is backwards compatible with ctsm5.3 datasets, so ctsm5.3 files can still be used.
 - Updating "agricultural fire peak month" raw dataset, as well as the algorithm determining this field's dominant values in mksurfdata_esmf
 - Future scenarios are done using the cmip6 ctsm5.3 surface datasets. The new XML variable CLM_CMIP_ERA controls this.
 - A few other updates come in as well for clm6_0:
   * New Initial Condition (IC) files
   * New parameter file
   * New crop calendar datasets
   * Changes to fire parameters along with new fire_method "li2024crujra"
   * New population density file

Contributors: Sam Levis, Peter Lawrence, Erik Kluzek, Will Wieder, Keith Oleson, Sam Rabin, Fang Li

See the ChangeLog for notes relevant to users and developers, for testing, for answer changes and pertinent simulations, and for submodule updates.

 Conflicts:
	bld/unit_testers/build-namelist_test.pl
@ekluzek ekluzek deleted the alpha-ctsm5.4.CMIP7 branch April 2, 2026 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement new capability or improved behavior of existing capability non-b4b Changes answers (incl. adding tests) PR status: awaiting review Work on this PR is paused while waiting for review. PR status: needs testing priority: high High priority to fix/merge soon, e.g., because it is a problem in important configurations science Enhancement to or bug impacting science size: large Large project that will take a few weeks or more test: aux_clm Pass aux_clm suite before merging test: ctsm_sci Run and check ctsm_sci suite before merging test: docs Test documentation build before merging test: fates Pass fates test suite before merging test: mksurfdata Test mksurfdata_esmf before merging test: PFUNIT Pass FUNITCTSM tests before merging test: python Pass clm_pymods test suite plus Python sys/unit tests before merging test: rivers Test RTM/MOSART/mizuRoute before merging

Projects

Status: Done (non release/external)
Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants