Skip to content

Conversation

@slevis-lmwg
Copy link
Contributor

@slevis-lmwg slevis-lmwg commented Jun 20, 2025

Description of changes

Brings to master the work done in #3206, which I merged to the ctsm5.4 alpha branch recently as tag
alpha-ctsm5.4.CMIP7.02.ctsm5.3.055.

Allows Cecile to run coupled without having to adjust clm things manually. In particular, updates namelist defaults, including new IC files, that have been limited to the ctsm5.4 branch so far.

Link to the upcoming branch tag for #3206 which I merged to the ctsm5.4 alpha branch recently.

Specific notes

Contributors other than yourself, if any:
@ekluzek @wwieder

CTSM Issues Fixed (include github issue #):
Resolves #3116
Resolves #3005

Are answers expected to change (and if so in what way)? Yes, greater than roundoff, same climate:

  • Reverted this in 4a5dfb5: Prior to alpha-ctsm5.4.CMIP7.02.ctsm5.3.055: Update default settings #3206 the ctsm5.4 branch had already changed the raw datasets in mksurfdata_esmf, causing the MKSURFDATAESMF test to differ from the baseline.
  • a3ce6a7 changes the default snow thermal conductivity schemes over lakes and glaciers in clm6 cases
  • a75e488 introduces a new paramfile to clm6 cases
  • Reverted this here since we're still working in ctsm5.3: b1890ac introduces new f09 & ne30 fsurdat/landuse files
  • 3a8c432 introduces new f09 & ne30 finidat files for 1850 and 2000 clm6 cases

Any User Interface Changes (namelist or namelist defaults changes)?
Namelist defaults changes

Does this create a need to change or add documentation? Did you do so?
Probably. Not at this time.

Testing performed, if any:
#3206 testing appears in this post and will be repeated before merging this PR to master.

wwieder and others added 27 commits April 23, 2025 11:55
…tsm5.3.040

Update ctsm5.4 alpha branch to latest ctsm5.3.040 version
draft to start updating to CMIP7 data for CTSM5.4
Redo ESCOMP#3085 to ctsm5.4. alpha branch fully this time
Changes to MEGAN needed for coupled cases

Corrections on how MEGAN coefficients are applied.

Depends on the cmeps tag cmeps1.1.1
alpha-ctsm5.4.CMIP7.02.ctsm5.3.055: Update default settings
Fix clm6 ISSP compset aliases

slevis resolved conflicts:
tools/mksurfdata_esmf/gen_mksurfdata_namelist.xml
@slevis-lmwg slevis-lmwg self-assigned this Jun 20, 2025
@slevis-lmwg slevis-lmwg added the non-bfb Changes answers (incl. adding tests) label Jun 20, 2025
@github-project-automation github-project-automation bot moved this to Ready to start (or start again) in CTSM: Upcoming tags Jun 20, 2025
@slevis-lmwg slevis-lmwg moved this from Todo to In Progress in LMWG: Sprint Planning Board Jun 20, 2025
@slevis-lmwg slevis-lmwg moved this from Ready to start (or start again) to In progress - master in CTSM: Upcoming tags Jun 20, 2025
@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Jun 20, 2025

Repeat #3206 testing as explained here (after merging ctsm5.3.059 to this branch)

  • ./build-namelist_test.pl
  • derecho aux_clm and fates bc this is an answer-changing tag
  • izumi aux_clm and fates

Bring in various cleanup efforts found in previous testing after the chill changes came in

Various updates for testing and other problems identified in the
cesm3_0_beta04 tag. So fixes and cleanup for usability.
Including the following:

- Fix SHR_ASSERT so single-point matrix test passes
- ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode and add ability
- Fixes warm starts in PTS_MODE so that SCAM can use restart files
- f19 + f45 16pft fsurdat/landuse files to namelist_defaults_ctsm + Makefile
- Changes in the FORTRAN code to properly abort when fire-emission is asked for
  it can't be provided. Added unit testing for this.

slevis resolved conflicts:
doc/ChangeLog
doc/ChangeSum
@slevis-lmwg
Copy link
Contributor Author

As in #3206, I get use_c1* = .false. for Clm60Bgc Hillslope tests, which I do not consider a problem for the purposes of this PR.

@slevis-lmwg slevis-lmwg requested a review from ekluzek June 23, 2025 22:12
@slevis-lmwg
Copy link
Contributor Author

@ekluzek I am requesting this review from you because you reviewed #3206 and the code updates are the same.

@ekluzek ekluzek marked this pull request as ready for review June 24, 2025 15:47
Copy link
Collaborator

@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.

This is identical to the work on the branch, so in general not a lot to say. But, I think there needs to be one important difference on master.

That is I think we keep the surface datasets all ctsm5.3, rather than updating any to ctsm5.4. This does mean that we'll need to continue to keep the alpha branch up to date and used as the final tag for each CESM alpha tag. But, I think that's OK. If we mix ctsm5.4 datasets into ctsm5.3 tags, it'll be forever confusing as to what datasets are in place for the tags.

So I think we remove those changes, but still include everything else. Including the ctsm5.4 finidat files. We should be able to use them, but each entry needs a use_init_interp=".true." in the XML.

I also was somewhat surprised you had to increase some of the wallclock times on izumi. But, it's not necessarily bad to do so. But, I wanted to ask you about that as to what behavior you saw.

@github-project-automation github-project-automation bot moved this from In progress - master to Stalled (needs review, blocked etc.) in CTSM: Upcoming tags Jun 24, 2025
@slevis-lmwg slevis-lmwg moved this from Stalled (needs review, blocked etc.) to In progress - master in CTSM: Upcoming tags Jun 24, 2025
@slevis-lmwg slevis-lmwg requested a review from ekluzek June 24, 2025 20:27
@slevis-lmwg slevis-lmwg moved this from In Progress to Done in LMWG: Sprint Planning Board Jun 24, 2025
@slevis-lmwg slevis-lmwg added PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete PR status: awaiting review Work on this PR is paused while waiting for review. labels Jun 25, 2025
@slevis-lmwg slevis-lmwg merged commit 7788b6b into ESCOMP:master Jun 25, 2025
5 checks passed
@slevis-lmwg slevis-lmwg deleted the prelim_upd_ctsm54_defaults branch June 25, 2025 17:15
@github-project-automation github-project-automation bot moved this from In progress - master to Done (non release/external) in CTSM: Upcoming tags Jun 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

non-bfb Changes answers (incl. adding tests) PR status: awaiting review Work on this PR is paused while waiting for review. PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete

Projects

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

Development

Successfully merging this pull request may close these issues.

Answer changing tag to modify snow thermal conductivity defaults Bring in ctsm5.4.0 IC files for clm6_0

3 participants