post-5.4.n01.alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Update post-5.4 branch to latest alpha5.4 tag by samsrabin · Pull Request #3649 · ESCOMP/CTSM

samsrabin · 2025-12-04T22:54:56Z

Description of changes

Merges tag alpha-ctsm5.4.CMIP7.21.ctsm5.3.085 into the post-5.4 branch at tag post-5.4.n01.

Specific notes

Contributors other than yourself, if any: None

CTSM Issues Fixed: None

Are answers expected to change (and if so in what way)? Yes; lots of ways.

Any User Interface Changes (namelist or namelist defaults changes)? Yes; lots.

Does this create a need to change or add documentation? Did you do so? No

Testing performed, if any: aux_clm has a bunch of diffs, but I'm assuming these are to be expected?

Derecho: /glade/derecho/scratch/samrabin/tests_1204-163718de/
Izumi: /scratch/cluster/samrabin/tests_1204-163723iz/

I used WhatsNewInCTSM5.3.md as the starting point for WhatsNewInCTSM5.4.md and will start modifying in subsequent commits

b4b-dev merge 2025-10-16

Merge ctsm5.3.080 into b4b-dev

…tream docs-build-and-deploy: Only run on upstream

…e for CTSM, this compiles with intel on Derecho

… in the local object

…into carbon_isotopes_in_streams

… CTSM stream base type

…ve memory when appropriate

…e method a bit, so that varnames and name aren't sent in, also have to make sdat public, so that the dshr_fldbun_getFldPtr method can use it's internal components

…s for C13/C14 timeseries handling

…ilename was incorrect as well as a typo for C13 in the Advance and Interp routines

…_streams

…n be used easier in the code, this increases memory, but matches the rest of CTSM better and isolates the handling of the grid for the C14 data which makes it easier for the grid to change, this is a prestep to moving to streams as this is how streams works

…ase_notes alpha-ctsm5.4.CMIP7.20.ctsm5.3.085: WhatsNewInCTSM5.4.md

Introduce WhatsNewInCTSM5.4.md and update other documentation: PR ESCOMP#3364

alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Three user_nl_clm and two .cfg files with ctsm5.4 updates

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

ekluzek · 2025-12-05T18:22:13Z

Actually, I've been leaving off advancing the branch tag number when it's merely an update to latest master. So I think this should be post-5.4.n01.alpha-ctsm5.4.CMIP7.21.ctsm5.3.05. And actually you might as well merge this to ctsm5.3.000 to make this post-5.4.n01.ctsm5.3.000. The merge to ctsm5.3.000 will just bring in ChangeLog updates.

It would be good for us to be consistent in how we manage the "nZZ" for branches. We could discuss this in a meeting if it would help.

ekluzek

I think this needs to have the base changed from master to post-5.4. I'll let you make sure that's right and do it. Then I can review it.

I also suggest you update to ctsm5.4.000 as it's now tagged and even just to shorten the tag name.

ekluzek · 2025-12-05T18:30:53Z

Oh, I see you ran testing on this. And the description clearly states this was meant to be to post-5.4 so I'll go ahead and rebase here.

ekluzek · 2025-12-05T19:07:27Z

The answer changing parts of this are for FATES due to going to ctsm5.3.083 (084 and 085 are b4b so don't matter). And then there are the changes from the ctsm5.4 alpha branch from alpha-ctsm5.4.CMIP7.18 to alpha-ctsm5.4.CMIP7.21. Looks like "19" fixed some LII tests which would show up as a diff, we must have skipped "20" and then "21" will have a few tests with differences.

@samsrabin by the way thanks for updating the tagnames to include the entire base version, it took me a bit to figure out what base version post-5.4.n01 corresponded to.

ekluzek · 2025-12-05T19:34:08Z

OK, 200 tests are different, but most of those are only due to fieldlist differences or missing baselines. The "21" ctsm5.4 update changed smallville and PLUMBER2 tests. So filtering out those and the Fates tests there are 27 with differences:

grep BASELINE */TestStatus | grep FAIL | grep DIFF | grep -v Fates | grep -v smallville | grep -v PLUMBER
ERI_D_Ld9.f10_f10_mg37.I1850Clm60BgcCrujra.derecho_gnu.clm-default.GC.1204-163718de_gnu/TestStatus:FAIL ERI_D_Ld9.f10_f10_mg37.I1850Clm60BgcCrujra.derecho_gnu.clm-default BASELINE post-5.4.n01: DIFF
ERI_D_Ld9.f10_f10_mg37.I1850Clm60Bgc.derecho_gnu.clm-default--clm-matrixcnOn.GC.1204-163718de_gnu/TestStatus:FAIL ERI_D_Ld9.f10_f10_mg37.I1850Clm60Bgc.derecho_gnu.clm-default--clm-matrixcnOn BASELINE post-5.4.n01: DIFF
ERI_D_Ld9.f10_f10_mg37.I1850Clm60Bgc.derecho_gnu.clm-default.GC.1204-163718de_gnu/TestStatus:FAIL ERI_D_Ld9.f10_f10_mg37.I1850Clm60Bgc.derecho_gnu.clm-default BASELINE post-5.4.n01: DIFF
ERP_D_Ld10_P64x2.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-default--clm-matrixcnOn_ignore_warnings.GC.1204-163718de_int/TestStatus:FAIL ERP_D_Ld10_P64x2.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-default--clm-matrixcnOn_ignore_warnings BASELINE post-5.4.n01: DIFF
ERP_D_Ld10_P64x2.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-default.GC.1204-163718de_int/TestStatus:FAIL ERP_D_Ld10_P64x2.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-default BASELINE post-5.4.n01: DIFF
ERP_D_Ld5.f10_f10_mg37.I1850Clm60BgcCrop.derecho_intel.clm-nvmovement--clm-matrixcnOn.GC.1204-163718de_int/TestStatus:FAIL ERP_D_Ld5.f10_f10_mg37.I1850Clm60BgcCrop.derecho_intel.clm-nvmovement--clm-matrixcnOn BASELINE post-5.4.n01: DIFF
ERP_Ly3_P64x2.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput--clm-matrixcnOn_ignore_warnings.GC.1204-163718de_int/TestStatus:FAIL ERP_Ly3_P64x2.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput--clm-matrixcnOn_ignore_warnings BASELINE post-5.4.n01: DIFF
ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_gnu.clm-monthly.GC.1204-163718de_gnu/TestStatus:FAIL ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_gnu.clm-monthly BASELINE post-5.4.n01: DIFF
ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings.GC.1204-163718de_int/TestStatus:FAIL ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings BASELINE post-5.4.n01: DIFF
ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly.GC.1204-163718de_int/TestStatus:FAIL ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly BASELINE post-5.4.n01: DIFF
ERR_Ld7.f10_f10_mg37.IHistClm60BgcCrop.derecho_gnu.clm-default.GC.1204-163718de_gnu/TestStatus:FAIL ERR_Ld7.f10_f10_mg37.IHistClm60BgcCrop.derecho_gnu.clm-default BASELINE post-5.4.n01: DIFF
ERR_Ld7.f10_f10_mg37.IHistClm60BgcCrop.derecho_gnu.drv-interim_restart.GC.1204-163718de_gnu/TestStatus:FAIL ERR_Ld7.f10_f10_mg37.IHistClm60BgcCrop.derecho_gnu.drv-interim_restart BASELINE post-5.4.n01: DIFF
ERS_Ly3.f10_f10_mg37.I1850Clm60BgcCropCmip6.derecho_intel.clm-basic.GC.1204-163718de_int/TestStatus:FAIL ERS_Ly3.f10_f10_mg37.I1850Clm60BgcCropCmip6.derecho_intel.clm-basic BASELINE post-5.4.n01: DIFF
ERS_Ly5_P128x1.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput--clm-matrixcnOn_ignore_warnings.GC.1204-163718de_int/TestStatus:FAIL ERS_Ly5_P128x1.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput--clm-matrixcnOn_ignore_warnings BASELINE post-5.4.n01: DIFF
ERS_Ly5_P128x1.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput.GC.1204-163718de_int/TestStatus:FAIL ERS_Ly5_P128x1.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput BASELINE post-5.4.n01: DIFF
IRT_Ld11.f10_f10_mg37.IHistClm60BgcCrop.derecho_gnu.clm-default.GC.1204-163718de_gnu/TestStatus:FAIL IRT_Ld11.f10_f10_mg37.IHistClm60BgcCrop.derecho_gnu.clm-default BASELINE post-5.4.n01: DIFF
LCISO_Ld396.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-ciso_monthly--clm-matrixcnOn_ignore_warnings.GC.1204-163718de_int/TestStatus:FAIL LCISO_Ld396.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-ciso_monthly--clm-matrixcnOn_ignore_warnings BASELINE post-5.4.n01: DIFF
LCISO_Ld396.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-ciso_monthly.GC.1204-163718de_int/TestStatus:FAIL LCISO_Ld396.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-ciso_monthly BASELINE post-5.4.n01: DIFF
LVG_Ld5_D.f10_f10_mg37.I1850Clm60Bgc.derecho_intel.clm-no_vector_output.GC.1204-163718de_int/TestStatus:FAIL LVG_Ld5_D.f10_f10_mg37.I1850Clm60Bgc.derecho_intel.clm-no_vector_output BASELINE post-5.4.n01: DIFF
REP_P64x2_Ld13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings.GC.1204-163718de_int/TestStatus:FAIL REP_P64x2_Ld13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings BASELINE post-5.4.n01: DIFF
REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings.GC.1204-163718de_int/TestStatus:FAIL REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings BASELINE post-5.4.n01: DIFF
RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput.GC.1204-163718de_int/TestStatus:FAIL RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput BASELINE post-5.4.n01: DIFF
SETPARAMFILE_Ld5.f10_f10_mg37.I1850Clm60BgcCrujra.derecho_gnu.clm-default.GC.1204-163718de_gnu/TestStatus:FAIL SETPARAMFILE_Ld5.f10_f10_mg37.I1850Clm60BgcCrujra.derecho_gnu.clm-default BASELINE post-5.4.n01: DIFF
SMS_D.f10_f10_mg37.I1850Clm60BgcCrop.derecho_intel.clm-ciso_soil_matrixcn_only.GC.1204-163718de_int/TestStatus:FAIL SMS_D.f10_f10_mg37.I1850Clm60BgcCrop.derecho_intel.clm-ciso_soil_matrixcn_only BASELINE post-5.4.n01: DIFF
SMS_Lm1.f10_f10_mg37.I1850Clm60BgcCropCmip6waccm.derecho_gnu.clm-basic.GC.1204-163718de_gnu/TestStatus:FAIL SMS_Lm1.f10_f10_mg37.I1850Clm60BgcCropCmip6waccm.derecho_gnu.clm-basic BASELINE post-5.4.n01: DIFF
SMS_Lm1.f10_f10_mg37.I1850Clm60Bgc.derecho_intel.clm-clm60_monthly_matrixcn_soilCN30.GC.1204-163718de_int/TestStatus:FAIL SMS_Lm1.f10_f10_mg37.I1850Clm60Bgc.derecho_intel.clm-clm60_monthly_matrixcn_soilCN30 BASELINE post-5.4.n01: DIFF
SMS_Lm1.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-leafcn_t_evolving.GC.1204-163718de_int/TestStatus:FAIL SMS_Lm1.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-leafcn_t_evolving BASELINE post-5.4.n01: DIFF
****

Looking at one of the short tests above I see that the finidat file is different (which came in ctsm5.4 "19"). So that explains those. So then looking through the above list to see if the namelists only differ by "finidat" -- I don't see any other differences.

So it looks like ALL of the differences are explained. Which seemed surprising at the initial list of 200 tests showing differences.

ekluzek

OK, cool. With the rebase we see the proper differences as expected. And going through the answer changes I was able to justify all 200 of the tests that showed differences (on derecho anyway). I think we don't need to do the same on Izumi. So this looks good to go to me! Thanks for working on this @samsrabin

Oh, I still recommend bringing in the documentation update to ctsm5.3.000 to simplify the branch tag name. And using n01 in the name. But, I'll let you do that part and it's fine to disagree and move forward and talk later...

samsrabin · 2025-12-08T17:19:49Z

Change baseline names to match new tag

rgknox and others added 30 commits July 24, 2025 11:06

added supplementation arguments to nutrient unpack routine

bcfaa79

set phosphorus supplementation status to true regarding fates

4ece46d

fixed typos and carbon_only ref was changed to the getter function

8cd660c

For ctsm5.4 replace WhatsNewInCTSM5.3.md with WhatsNewInCTSM5.4.md

2e5e87c

I used WhatsNewInCTSM5.3.md as the starting point for WhatsNewInCTSM5.4.md and will start modifying in subsequent commits

Draft WhatNewinCTSM54_release_notes (mostly deletes, some additions)

eadb1f7

Draft WhatsNewInCTSM5.4.md with ChangeLog info from ctsm5.3.022 to .065

50c7143

Bring back WhatsNewInCTSM5.3.md but in the /doc directory

5510a7e

An update to WhatsNewInCTSM5.4.md about changes in ctsm5.3.040

224cf73

Merge tag 'ctsm5.3.080' into merge-master-20251016

a8d4c2c

b4b-dev merge 2025-10-16

Merge pull request ESCOMP#3556 from samsrabin/merge-master-20251016

23f7dd4

Merge ctsm5.3.080 into b4b-dev

docs-build-and-deploy: Only run on upstream.

f322bf6

Merge pull request ESCOMP#3557 from samsrabin/only-deploy-docs-on-ups…

37661b7

…tream docs-build-and-deploy: Only run on upstream

Initial add of general structure for a CDEPS streams base class to us…

9b54d65

…e for CTSM, this compiles with intel on Derecho

Add contents of the Advance, add some error checking, store some data…

1ec43f9

… in the local object

Merge branch 'carbon_isotopes_in_streams' of github.com:ekluzek/CTSM …

c9e24bc

…into carbon_isotopes_in_streams

Merge branch 'master' into fates-l2fr-supp-merge

5f51958

set_paramfile: Can now set all values of a parameter to same.

20d6279

Update set_paramfile doc to show new capability.

396490c

Delete new test that's duplicative.

adc13e1

Initial commit of streams for delta_C13 and delta_C14 that extend the…

01e2228

… CTSM stream base type

Correct the interface

cc8a0b0

Changes so there is a final method that the compiler can call to remo…

1ca79d1

…ve memory when appropriate

Add contents of the Interp methods for c13/c14, change Init streambas…

7acfbc9

…e method a bit, so that varnames and name aren't sent in, also have to make sdat public, so that the dshr_fldbun_getFldPtr method can use it's internal components

Hardcode namelist items and add calls to CTSM Streams Init subroutine…

52b238b

…s for C13/C14 timeseries handling

Correct varnames on the carbon isotope stream files

d8e2100

Fix the C14 isotope read, it needs to NOT have a mesh file, and the f…

a23c8f8

…ilename was incorrect as well as a typo for C13 in the Advance and Interp routines

Merge remote-tracking branch 'escomp/b4b-dev' into carbon_isotopes_in…

0043306

…_streams

Remove a trailing whitespace

492d6e9

Merge branch 'master' into fates-l2fr-supp

d5bc5a5

slevis-lmwg and others added 8 commits November 26, 2025 18:31

Three user_nl_clm and two .cfg files with ctsm5.4 updates

83f35cb

Merge pull request ESCOMP#3364 from slevis-lmwg/WhatsNewinCTSM54_rele…

5e692a5

…ase_notes alpha-ctsm5.4.CMIP7.20.ctsm5.3.085: WhatsNewInCTSM5.4.md

Merge tag 'alpha-ctsm5.4.CMIP7.20.ctsm5.3.085' into ctsm54_test_updates

f3f42b8

Introduce WhatsNewInCTSM5.4.md and update other documentation: PR ESCOMP#3364

Update ExpectedTestFails.xml according to Erik's comments

8b49fe3

Remove one more previously-expected failure from ExpectedTestFails.xml

2dbc28d

Add H2OSNO to default hist_fincl1 for clm_accelerated_spinup ON or SASU

89a4cae

Merge pull request ESCOMP#3637 from slevis-lmwg/ctsm54_test_updates

673574b

alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Three user_nl_clm and two .cfg files with ctsm5.4 updates

samsrabin self-assigned this Dec 4, 2025

samsrabin changed the title ~~post-5.4.n02-alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Update post-5.4 branch to latest alpha5.4 tag~~ post-5.4.n02.alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Update post-5.4 branch to latest alpha5.4 tag Dec 4, 2025

samsrabin marked this pull request as ready for review December 5, 2025 04:31

ekluzek requested changes Dec 5, 2025

View reviewed changes

Comment thread .gitmodules

ekluzek added the enhancement new capability or improved behavior of existing capability label Dec 5, 2025

ekluzek added this to CTSM: Upcoming tags Dec 5, 2025

github-project-automation Bot moved this from Ready to start (or start again) to Stalled (needs review, blocked etc.) in CTSM: Upcoming tags Dec 5, 2025

github-project-automation Bot moved this to Ready to start (or start again) in CTSM: Upcoming tags Dec 5, 2025

ekluzek added this to the cesm3_0_beta08 milestone Dec 5, 2025

ekluzek changed the base branch from master to post-5.4 December 5, 2025 18:31

ekluzek moved this from Stalled (needs review, blocked etc.) to In progress - release/externals / MOSART / RTM / mizu etc. tags in CTSM: Upcoming tags Dec 5, 2025

ekluzek approved these changes Dec 5, 2025

View reviewed changes

github-project-automation Bot moved this from In progress - release/externals / MOSART / RTM / mizu etc. tags to In progress - master in CTSM: Upcoming tags Dec 5, 2025

samsrabin changed the title ~~post-5.4.n02.alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Update post-5.4 branch to latest alpha5.4 tag~~ post-5.4.n01.alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Update post-5.4 branch to latest alpha5.4 tag Dec 8, 2025

ekluzek moved this from In progress - master to In progress - release/externals / MOSART / RTM / mizu etc. tags in CTSM: Upcoming tags Dec 8, 2025

samsrabin merged commit 6abd0c5 into ESCOMP:post-5.4 Dec 8, 2025
8 checks passed

github-project-automation Bot moved this from In progress - release/externals / MOSART / RTM / mizu etc. tags to Done (non release/external) in CTSM: Upcoming tags Dec 8, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

post-5.4.n01.alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Update post-5.4 branch to latest alpha5.4 tag#3649

post-5.4.n01.alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Update post-5.4 branch to latest alpha5.4 tag#3649
samsrabin merged 154 commits into
ESCOMP:post-5.4from
samsrabin:merge-alpha5.4-21.85-to-post-5.4

samsrabin commented Dec 4, 2025 •

edited

Loading

Uh oh!

ekluzek commented Dec 5, 2025

Uh oh!

ekluzek left a comment

Uh oh!

Uh oh!

ekluzek commented Dec 5, 2025

Uh oh!

ekluzek commented Dec 5, 2025

Uh oh!

ekluzek commented Dec 5, 2025

Uh oh!

ekluzek left a comment

Uh oh!

samsrabin commented Dec 8, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

samsrabin commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of changes

Specific notes

Uh oh!

ekluzek commented Dec 5, 2025

Uh oh!

ekluzek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ekluzek commented Dec 5, 2025

Uh oh!

ekluzek commented Dec 5, 2025

Uh oh!

ekluzek commented Dec 5, 2025

Uh oh!

ekluzek left a comment

Choose a reason for hiding this comment

Uh oh!

samsrabin commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

samsrabin commented Dec 4, 2025 •

edited

Loading

samsrabin commented Dec 8, 2025 •

edited

Loading