Skip to content

Merge ctsm5.4.016 into b4b-dev #3746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samsrabin merged 43 commits into from
Feb 6, 2026
Merged

Merge ctsm5.4.016 into b4b-dev #3746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a086708
Fix for C-balance error that manifested in B-cases with pft 67
slevis-lmwg Jan 22, 2026
da54846
Update src/biogeochem/CNPhenologyMod.F90
slevis-lmwg Jan 22, 2026
5df9554
Correction to last commit, completing PR's alternate solution
slevis-lmwg Jan 22, 2026
aaf2239
Point to the C14 isotope and mesh file with tweaked latitude/longitud…
ekluzek Jan 22, 2026
2578963
Merge remote-tracking branch 'escomp' into tweaked_ciso_file
ekluzek Jan 23, 2026
07aa3da
Revert "Fix for C-balance error that manifested in B-cases with pft 67"
slevis-lmwg Jan 23, 2026
36bf84a
Improve the comment that goes with the new section
slevis-lmwg Jan 23, 2026
8ca8bd9
Merge tag 'ctsm5.4.011' into pft67_cbal_fix
slevis-lmwg Jan 23, 2026
5892248
First draft ChangeLog/Sum
slevis-lmwg Jan 23, 2026
13979a5
Add in the ne30 IC file to do a temporary patch to the Greenland snow…
ekluzek Jan 24, 2026
d198730
Merge branch 'tweaked_ciso_file' of github.com:ekluzek/CTSM into twea…
ekluzek Jan 24, 2026
cd52e2b
Whoops, I put the new file in the wrong place for f09 rather than ne30
ekluzek Jan 25, 2026
2bf508c
fix xm2 and revise logic for excess ice melt
mvdebolskiy Jan 26, 2026
4fb402b
Updated ChangeLog/Sum
slevis-lmwg Jan 26, 2026
aee764b
Merge pull request #3702 from slevis-lmwg/pft67_cbal_fix
slevis-lmwg Jan 26, 2026
ee8b281
Merge tag 'ctsm5.4.012' into tweaked_ciso_file
ekluzek Jan 27, 2026
aaeb0fd
Remove NEON fails from the testlist
ekluzek Jan 27, 2026
2bd7923
ERR tests started passing in ctsm5.4.001 so remove from expected fails
ekluzek Jan 27, 2026
71326fa
Remove MKSURFDATA_ESMF test from expected fails as #3453 has been PAS…
ekluzek Jan 27, 2026
9c9240c
Initial update to change files
ekluzek Jan 27, 2026
3a705fd
Final Change files
ekluzek Jan 28, 2026
c6342c8
remove comments, rename phasechange
mvdebolskiy Jan 28, 2026
9a53d7d
Merge remote-tracking branch 'origin/master' into pr-fix-xm2-excess-ice
mvdebolskiy Jan 28, 2026
7d4a371
Merge pull request #3711 from ekluzek/tweaked_ciso_file
ekluzek Jan 28, 2026
309e13c
Add changelog draft
mvdebolskiy Jan 28, 2026
9f5c360
One more NEON case to remove from expected fails
ekluzek Jan 28, 2026
37c2276
Update swensosc comment
mvdebolskiy Jan 28, 2026
32a107e
Merge remote-tracking branch 'origin/master' into pr-fix-xm2-excess-ice
mvdebolskiy Jan 28, 2026
7d40ebb
Update change files a bit
ekluzek Jan 28, 2026
4e52e33
Add lmwg_dev issue to changelog
mvdebolskiy Jan 29, 2026
c970397
Updates to change log files, and template to allow to document simula…
ekluzek Jan 29, 2026
83c7b13
Merge branch 'pr-fix-xm2-excess-ice' of github.com:mvdebolskiy/CTSM i…
ekluzek Jan 29, 2026
7871ea9
Merge pull request #3718 from mvdebolskiy/pr-fix-xm2-excess-ice
ekluzek Jan 29, 2026
0bebdaa
Update cism to 2_2_013, where 2_2_012 and 2_2_013 change answers for …
ekluzek Jan 30, 2026
4559a53
Add a GAG test with both Greenland and Antarctica ice sheets to make …
ekluzek Feb 2, 2026
55b4659
Add the missing CISM Clm60 compsets fixing #3732
ekluzek Feb 2, 2026
2bd7cca
Set to 3 years as 3 is the minimum for a ERS test
ekluzek Feb 2, 2026
78026c9
Update change files
ekluzek Feb 3, 2026
0ed4b3b
Merge pull request #3733 from ekluzek/update_cism2213_w_answer_changes
ekluzek Feb 3, 2026
e725448
Merge tag 'ctsm5.4.015' into b4b-dev-merge-20260205
samsrabin Feb 5, 2026
7d486e5
Update ChangeLog and ChangeSum.
samsrabin Feb 6, 2026
96b9398
Merge pull request #3741 from samsrabin/b4b-dev-merge-20260205
samsrabin Feb 6, 2026
13e9624
Merge tag 'ctsm5.4.016' into merge-master-20260205
samsrabin Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fxDONOTUSEurl = https://github.com/NGEET/fates
[submodule "cism"]
path = components/cism
url = https://github.com/ESCOMP/CISM-wrapper
fxtag = cismwrap_2_2_011
fxtag = cismwrap_2_2_013
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
Expand Down
12 changes: 8 additions & 4 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<atm_c14_filename use_c14=".true." use_c14_bombspike =".true." ssp_rcp="SSP5-8.5" cmip_era="cmip6">lnd/clm2/isotopes/atm_delta_C14_CMIP6_SSP5B_3x1_global_1850-2100_yearly_c181209.nc</atm_c14_filename>

<!-- Settings for Carbon Isotope streams -->
<stream_fldfilename_atm_c14 use_c14=".true." use_c14_bombspike =".true." ssp_rcp="hist" cmip_era="cmip7">lnd/clm2/isotopes/ctsmforc.Graven.atm_delta_C14_CMIP7_360x720_1700-2023_yearly_v3.0_c251117.nc</stream_fldfilename_atm_c14>
<stream_meshfile_atm_c14 use_c14=".true." use_c14_bombspike =".true." >share/meshes/360x720_120830_ESMFmesh_c20210507_cdf5.nc</stream_meshfile_atm_c14>
<stream_fldfilename_atm_c14 use_c14=".true." use_c14_bombspike =".true." ssp_rcp="hist" cmip_era="cmip7">lnd/clm2/isotopes/ctsmforc.Graven.atm_delta_C14_CMIP7_360x720_1700-2023_yearly_v3.0_tweaked_latlons_c260108.nc</stream_fldfilename_atm_c14>
<stream_meshfile_atm_c14 use_c14=".true." use_c14_bombspike =".true." >share/meshes/360x720_120830_ESMFmesh_tweaked_latlons_c20260108.nc</stream_meshfile_atm_c14>

<!-- The following are only set if both use_c14 and use_c14_bombspike are TRUE -->
<stream_year_first_atm_c14 sim_year="2018" sim_year_range="constant">2018</stream_year_first_atm_c14>
Expand Down Expand Up @@ -927,9 +927,11 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." phys="clm6_0" use_cn=".false."
>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v2 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true.
</init_interp_attributes>
<!-- For now comment this out, until we also have an SP finidat file to use
<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." phys="clm6_0" use_cn=".false."
>hgrid=ne30np4.pg3 maxpft=17 mask=tx2_3v2 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true.
</init_interp_attributes>
-->

<init_interp_attributes sim_year="2000" use_cndv=".false." use_fates=".false." phys="clm6_0" use_cn=".false."
>hgrid=0.9x1.25 maxpft=17 mask=tx2_3v2 use_cn=.false. use_crop=.false. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.true.
Expand Down Expand Up @@ -1420,12 +1422,14 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
phys="clm6_0"
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_SP_f09_127_1850.clm2.r.0102-01-01-00000.nc
</finidat>
<!-- comment out the SP case and use the BGC case for now
<finidat hgrid="ne30np4.pg3" maxpft="17" mask="tx2_3v2" use_cn=".false." use_cndv=".false." use_fates=".false."
ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false." use_excess_ice=".true."
ic_tod="0" glc_nec="10" use_crop=".false."
phys="clm6_0"
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_SP_ne30_126_1850.clm2.r.0102-01-01-00000.nc
</finidat>
-->

<finidat hgrid="0.9x1.25" maxpft="17" mask="tx2_3v2" use_cn=".false." use_cndv=".false." use_fates=".false."
ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false." use_excess_ice=".true."
Expand All @@ -1447,12 +1451,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
phys="clm6_0"
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_f09_124_pSASU.clm2.r.0161-01-01-00000.nc
</finidat>
<!-- Corresponding ne30 -->
<!-- ne30 case with the Greenland snow "hole" patched -->
<finidat hgrid="ne30np4.pg3" mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."
sim_year="1850" do_transient_pfts=".false." use_excess_ice=".true."
use_crop=".true."
phys="clm6_0"
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_ne30_123_pSASU.clm2.r.0161-01-01-00000.nc
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.4.004_bgc_ne30_130_pSASU_greenland.clm2.r.0121-01-01-00000.nc
</finidat>
<!-- Corresponding f19 -->
<finidat hgrid="1.9x2.5" mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."
Expand Down
20 changes: 20 additions & 0 deletions cime_config/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,21 @@
</compset>

<!-- Latest CLM version -->
<compset>
<alias>I1850Clm60SpG</alias>
<lname>1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
</compset>

<compset>
<alias>I1850Clm60SpGa</alias>
<lname>1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_CISM2%AIS-EVOLVE_SWAV</lname>
</compset>

<compset>
<alias>I1850Clm60SpGag</alias>
<lname>1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_CISM2%AIS-EVOLVE%GRIS-EVOLVE_SWAV</lname>
</compset>

<compset>
<alias>I1850Clm60BgcCropG</alias>
<lname>1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
Expand Down Expand Up @@ -731,6 +746,11 @@
<lname>1850_DATM%GSWP3v1_CLM50%SP_SICE_SOCN_SROF_CISM2%AIS-EVOLVE%GRIS-EVOLVE_SWAV</lname>
</compset>

<compset>
<alias>I1850Clm60SpRsGag</alias>
<lname>1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_CISM2%AIS-EVOLVE%GRIS-EVOLVE_SWAV</lname>
</compset>

<compset>
<alias>I1850Clm60SpRs</alias>
<lname>1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV</lname>
Expand Down
110 changes: 0 additions & 110 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,6 @@
<comment>Restart issues with default "inactive" fields added to history by hist_all_fields.</comment>
</phase>
</test>
<test name="MKSURFDATAESMF_P128x1.f10_f10_mg37.I1850Clm50BgcCrop.derecho_intel">
<phase name="NLCOMP">
<status>FAIL</status>
<issue>#3453</issue>
</phase>
</test>
<test name="SUBSETDATAPOINT_Ld5_D_Mmpi-serial.CLM_USRDAT.I2000Clm60BgcCropCrujra.derecho_intel.clm-default">
<phase name="NLCOMP">
<status>FAIL</status>
Expand Down Expand Up @@ -189,100 +183,20 @@
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.derecho_gnu.clm-default--clm-NEON-HARV">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.derecho_gnu.clm-NEON-MOAB--clm-PRISM">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
<phase name="RUN">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
</test>

<test name="FUNITCTSM_P1x1.f10_f10_mg37.I2000Clm50Sp.izumi_intel">
<phase name="RUN">
<status>FAIL</status>
<issue>#3182</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-default--clm-NEON-HARV--clm-matrixcnOn">
<phase name="RUN">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-NEON-MOAB--clm-PRISM">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
<phase name="RUN">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.derecho_gnu.clm-FatesPRISM--clm-NEON-FATES-YELL">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
<phase name="RUN">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60SpRs.derecho_gnu.clm-default--clm-NEON-TOOL">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
<phase name="RUN">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
</test>

<test name="ERS_Ld60.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdST3">
<phase name="RUN">
<status>FAIL</status>
<issue>#2867</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.izumi_nag.clm-FatesFireLightningPopDens--clm-NEON-FATES-NIWO">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
<phase name="RUN">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.izumi_nag.clm-FatesPRISM--clm-NEON-FATES-YELL">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
<phase name="RUN">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
</test>

<!-- fates test suite failures -->

<!-- This is commented out because cime currently does NOT allow longnames in the XML in the XSD for this file
Expand Down Expand Up @@ -344,17 +258,6 @@
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.derecho_intel.clm-FatesFireLightningPopDens--clm-NEON-FATES-NIWO">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
<phase name="RUN">
<status>FAIL</status>
<issue>#3038</issue>
</phase>
</test>

<test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdLandUse">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
Expand Down Expand Up @@ -396,19 +299,6 @@

<!-- interim_restart (and aux_clm) test list-->

<test name="ERR_Ld7.f10_f10_mg37.I2000Clm50BgcCropRtm.derecho_gnu.clm-default">
<phase name="COMPARE_base_rest">
<status>FAIL</status>
<issue>#3383</issue>
</phase>
</test>

<test name="ERR_Ld7.f10_f10_mg37.IHistClm60BgcCrop.derecho_gnu.clm-default">
<phase name="COMPARE_base_rest">
<status>FAIL</status>
<issue>#3383</issue>
</phase>
</test>
<test name="ERI_Ld41.f10_f10_mg37.I2000Clm60BgcCrop.derecho_gnu.clm-default">
<phase name="COMPARE_base_hybrid">
<status>FAIL</status>
Expand Down
9 changes: 9 additions & 0 deletions cime_config/testdefs/testlist_clm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,15 @@
<option name="comment">Repeat CESM3 development test with Crujra while Gswp is still the default</option>
</options>
</test>
<test name="ERS_Ly3" grid="f10_f10_ais8gris4_mg37" compset="I1850Clm60SpGag">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">1:00:00</option>
<option name="comment">Mid-year exact restart test. Also covers multiple ice sheets in a multi-year I compset test.</option>
</options>
</test>
<test name="SMS" grid="ne30pg3_t232" compset="I2000Clm60BgcCrop" testmods="clm/clm60cam7LndTuningMode">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
Expand Down
2 changes: 1 addition & 1 deletion components/cism
Open in desktop
Submodule cism updated 8 files
+1 −1 .gitmodules
+158 −0 ChangeLog
+24 −24 cime_config/config_pes.xml
+386 −270 cime_config/namelist_definition_cism.xml
+1 −1 cime_config/testdefs/testmods_dirs/cism/change_params/user_nl_cism
+1 −1 source_cism
+8 −1 source_glc/glc_InitMod.F90
+6 −4 source_glc/glc_constants.F90
6 changes: 4 additions & 2 deletions doc/.ChangeLog_template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,10 @@ Changes answers relative to baseline:
changes to state fields usually grow to greater than roundoff as the simulation progresses.

If this tag changes climate list the run(s) done to evaluate the new
climate (from https://github.com/NCAR/LMWG_dev)
- issue number(s):
climate. Preferably in https://github.com/NCAR/LMWG_dev (or give details below)
- LMWG_dev issue number(s):

- details (casename, machine, user, link to plots etc.) [if not in LMWG_dev]

Other details
-------------
Expand Down
Loading