Skip to content

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

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
merged 5 commits into from
Dec 2, 2025
+22 −53
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83f35cb
Three user_nl_clm and two .cfg files with ctsm5.4 updates
slevis-lmwg Nov 27, 2025
f3f42b8
Merge tag 'alpha-ctsm5.4.CMIP7.20.ctsm5.3.085' into ctsm54_test_updates
slevis-lmwg Dec 1, 2025
8b49fe3
Update ExpectedTestFails.xml according to Erik's comments
slevis-lmwg Dec 1, 2025
2dbc28d
Remove one more previously-expected failure from ExpectedTestFails.xml
slevis-lmwg Dec 2, 2025
89a4cae
Add H2OSNO to default hist_fincl1 for clm_accelerated_spinup ON or SASU
slevis-lmwg Dec 2, 2025
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
29 changes: 0 additions & 29 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@


<!-- ctsm_sci test suite failures -->
<test name="ERP_D_Ld3_PS.f09_g17.I2000Clm50Sp.derecho_intel.clm-prescribed">
<phase name="RUN">
<status>FAIL</status>
<issue>#3529</issue>
<comment>We will generate new fsurdat files with the new raw lai file to resolve this issue.</comment>
</phase>
</test>
<test name="SMS_Ld12_Mmpi-serial.1x1_urbanc_alpha.I1PtClm60SpRs.derecho_intel.clm-output_sp_highfreq">
<phase name="RUN">
<status>FAIL</status>
Expand Down Expand Up @@ -69,12 +62,6 @@
</test>

<!-- aux_clm test suite failures -->
<test name="ERP_D_Ld9.f10_f10_mg37.I1850Clm60BgcCrop.izumi_nag.clm-clm60cam7LndTuningModeLDust">
<phase name="RUN">
<status>FAIL</status>
<issue>#3495</issue>
</phase>
</test>
<test name="MKSURFDATAESMF_P128x1.f10_f10_mg37.I1850Clm50BgcCrop.derecho_intel">
<phase name="NLCOMP">
<status>FAIL</status>
Expand Down Expand Up @@ -338,22 +325,6 @@
</phase>
</test>

<test name="LII2FINIDATAREAS_D_P256x2_Ld1.f09_t232.I1850Clm60BgcCrop.derecho_intel.clm-default">
<phase name="COMPARE_base_no_interp">
<status>FAIL</status>
<issue>#3252</issue>
<comment>This should be resolved for the 5.4 release.</comment>
</phase>
</test>

<test name="LII2FINIDATAREAS_D_P256x2_Ld1.f09_t232.I1850Clm60BgcCrop.derecho_intel.clm-default--clm-matrixcnOn_ignore_warnings">
<phase name="COMPARE_base_no_interp">
<status>FAIL</status>
<issue>#3252</issue>
<comment>This should be resolved for the 5.4 release.</comment>
</phase>
</test>

<!-- Other submodule test list failures (MOSART, RTM, etc. -->

<test name="SMS_Lh3.f10_f10_mg37.I2000Clm60Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/smallville_dynlakes_monthly/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ do_transient_lakes = .true.
! Key points are that lake area starts as 0, increases after the first year, then decreases after the second year.
! PCT_CROP is also changed so that PCT_LAKE + PCT_CROP <= 100. (Here, PCT_CROP increases and decreases at the same time as PCT_LAKE in order to exercise the simultaneous increase or decrease of two landunits, but that isn't a critical part of this test.)
! Note that the use of this file means that this testmod can only be used with the 1x1_smallvilleIA grid.
flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.3.0/synthetic/landuse.timeseries_1x1_smallvilleIA_synth_SSP2-4.5_1850-1855_78pfts_dynLakes_c240912.nc'
flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.4.0/synthetic/landuse.timeseries_1x1_smallvilleIA_synth_1850-1855_78pfts_dynLakes_c251023.nc'

! NOTE slevis (2024/2/23) Adding option for tests to pass. In the long term
! ensure that subset_data generates fsurdat and landuse files consistent with
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ do_transient_urban = .true.
! Medium density urban is set to zero to test the memory-saving behavior of PCT_URBAN_MAX.
! PCT_CROP is also changed so that PCT_URBAN + PCT_CROP <= 100. (Here, PCT_CROP increases and decreases at the same time as PCT_URBAN in order to exercise the simultaneous increase or decrease of two landunits, but that isn't a critical part of this test.)
! Note that the use of this file means that this testmod can only be used with the 1x1_smallvilleIA grid.
flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.3.0/synthetic/landuse.timeseries_1x1_smallvilleIA_synth_SSP2-4.5_1850-1855_78pfts_dynUrban_c240912.nc'
flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.4.0/synthetic/landuse.timeseries_1x1_smallvilleIA_synth_1850-1855_78pfts_dynUrban_c251023.nc'

! NOTE slevis (2024/2/23) Adding option for tests to pass. In the long term
! ensure that subset_data generates fsurdat and landuse files consistent with
Expand Down
2 changes: 1 addition & 1 deletion cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
!----------------------------------------------------------------------------------

flanduse_timeseries = ' ' ! This isn't needed for a non transient case, but will be once we start using transient compsets
fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/ctsm5.3.0/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_2000_16pfts_c240912.nc"
fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/ctsm5.4.0/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_2000_16pfts_c251023.nc"

! custom namelist changes for each site / case
12 changes: 6 additions & 6 deletions python/ctsm/test/testinputs/default_data.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ precname = CLMCRUJRA2024.Precip
tpqwname = CLMCRUJRA2024.TPQW

[surfdat]
dir = lnd/clm2/surfdata_esmf/ctsm5.3.0
surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c240908.nc
surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c240908.nc
dir = lnd/clm2/surfdata_esmf/ctsm5.4.0
surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c251022.nc
surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c251022.nc
mesh_dir = share/meshes/
mesh_surf = fv0.9x1.25_141008_ESMFmesh.nc

[landuse]
dir = lnd/clm2/surfdata_esmf/ctsm5.3.0
landuse_16pft = landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc
landuse_78pft = landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc
dir = lnd/clm2/surfdata_esmf/ctsm5.4.0
landuse_16pft = landuse.timeseries_0.9x1.25_hist_1850-2023_16pfts_c251022.nc
landuse_78pft = landuse.timeseries_0.9x1.25_hist_1850-2023_78pfts_c251022.nc

[domain]
file = share/domains/domain.lnd.fv0.9x1.25_gx1v7.151020.nc
12 changes: 6 additions & 6 deletions python/ctsm/test/testinputs/default_data_gswp3.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ precname = CLMGSWP3v1.Precip
tpqwname = CLMGSWP3v1.TPQW

[surfdat]
dir = lnd/clm2/surfdata_esmf/ctsm5.3.0
surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c240908.nc
surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c240908.nc
dir = lnd/clm2/surfdata_esmf/ctsm5.4.0
surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c251022.nc
surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c251022.nc
mesh_dir = share/meshes/
mesh_surf = fv0.9x1.25_141008_ESMFmesh.nc

[landuse]
dir = lnd/clm2/surfdata_esmf/ctsm5.3.0
landuse_16pft = landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc
landuse_78pft = landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc
dir = lnd/clm2/surfdata_esmf/ctsm5.4.0
landuse_16pft = landuse.timeseries_0.9x1.25_hist_1850-2023_16pfts_c251022.nc
landuse_78pft = landuse.timeseries_0.9x1.25_hist_1850-2023_78pfts_c251022.nc

[domain]
file = share/domains/domain.lnd.fv0.9x1.25_gx1v7.151020.nc
Loading