Skip to content

Commit 83f35cb

Browse files
committed
Three user_nl_clm and two .cfg files with ctsm5.4 updates
1 parent 3cfe210 commit 83f35cb

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

cime_config/testdefs/testmods_dirs/clm/smallville_dynlakes_monthly/user_nl_clm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ do_transient_lakes = .true.
66
! Key points are that lake area starts as 0, increases after the first year, then decreases after the second year.
77
! 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.)
88
! Note that the use of this file means that this testmod can only be used with the 1x1_smallvilleIA grid.
9-
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'
9+
flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.4.0/synthetic/landuse.timeseries_1x1_smallvilleIA_synth_1850-1855_78pfts_dynLakes_c251023.nc'
1010

1111
! NOTE slevis (2024/2/23) Adding option for tests to pass. In the long term
1212
! ensure that subset_data generates fsurdat and landuse files consistent with

cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/user_nl_clm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ do_transient_urban = .true.
77
! Medium density urban is set to zero to test the memory-saving behavior of PCT_URBAN_MAX.
88
! 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.)
99
! Note that the use of this file means that this testmod can only be used with the 1x1_smallvilleIA grid.
10-
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'
10+
flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.4.0/synthetic/landuse.timeseries_1x1_smallvilleIA_synth_1850-1855_78pfts_dynUrban_c251023.nc'
1111

1212
! NOTE slevis (2024/2/23) Adding option for tests to pass. In the long term
1313
! ensure that subset_data generates fsurdat and landuse files consistent with

cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_clm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
!----------------------------------------------------------------------------------
2020

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

2424
! custom namelist changes for each site / case

python/ctsm/test/testinputs/default_data.cfg

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ precname = CLMCRUJRA2024.Precip
1515
tpqwname = CLMCRUJRA2024.TPQW
1616

1717
[surfdat]
18-
dir = lnd/clm2/surfdata_esmf/ctsm5.3.0
19-
surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c240908.nc
20-
surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c240908.nc
18+
dir = lnd/clm2/surfdata_esmf/ctsm5.4.0
19+
surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c251022.nc
20+
surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c251022.nc
2121
mesh_dir = share/meshes/
2222
mesh_surf = fv0.9x1.25_141008_ESMFmesh.nc
2323

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

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

python/ctsm/test/testinputs/default_data_gswp3.cfg

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ precname = CLMGSWP3v1.Precip
1515
tpqwname = CLMGSWP3v1.TPQW
1616

1717
[surfdat]
18-
dir = lnd/clm2/surfdata_esmf/ctsm5.3.0
19-
surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c240908.nc
20-
surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c240908.nc
18+
dir = lnd/clm2/surfdata_esmf/ctsm5.4.0
19+
surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c251022.nc
20+
surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c251022.nc
2121
mesh_dir = share/meshes/
2222
mesh_surf = fv0.9x1.25_141008_ESMFmesh.nc
2323

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

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

0 commit comments

Comments
 (0)