Skip to content

alpha-ctsm5.4.CMIP7.19.ctsm5.3.082: Fix LII2 COMPARE_base_no_interp failures #3613

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

Open
wants to merge 5 commits into
base: alpha-ctsm5.4.CMIP7
Choose a base branch
from
Open

alpha-ctsm5.4.CMIP7.19.ctsm5.3.082: Fix LII2 COMPARE_base_no_interp failures #3613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d8b770
Change namelist_defaults so lii2 tests pick up correct finidats
slevis-lmwg Nov 19, 2025
e684a9b
Remove VEGWP[LN,PD] from restarts for lii2 tests to pass
slevis-lmwg Nov 19, 2025
aaf6f82
Put VEGWP[LN,PD] back on restart (= revert e684a9b) + rm from history
slevis-lmwg Nov 20, 2025
8db2e53
Rm use_init_interp=.T. from files clmi.f09_interp... & clmi.f19_twice...
slevis-lmwg Nov 21, 2025
a5136fc
File path and name updated to ctsm5.4 values for unit test to PASS
slevis-lmwg Nov 22, 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
14 changes: 7 additions & 7 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 @@ -1326,6 +1326,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
lnd_tuning_mode="clm5_0_GSWP3v1" use_init_interp=".true."
>lnd/clm2/initdata_esmf/ctsm5.3/clmi.interp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c240223.nc
</finidat>
<finidat hgrid="0.9x1.25" maxpft="79" mask="tx2_3v2" use_cn=".true." 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=".true." irrigate=".false."
phys="clm6_0"
>lnd/clm2/initdata_esmf/ctsm5.4/clmi.f09_interp_from.ctsm5.4.CMIP7_ciso_ctsm5.3.075_f09_124_pSASU.clm2.r.0161_c251118.nc
</finidat>


<finidat hgrid="0.9x1.25" maxpft="79" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
Expand Down Expand Up @@ -1430,13 +1436,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<finidat hgrid="1.9x2.5" maxpft="79" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
ic_ymd="20110101" sim_year="2000" do_transient_pfts=".false." use_excess_ice=".false."
ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
lnd_tuning_mode="clm5_0_GSWP3v1" use_init_interp=".false."
>lnd/clm2/initdata_esmf/ctsm5.4/clmi.f19_twiceinterp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c251030.nc
</finidat>
<finidat hgrid="1.9x2.5" maxpft="79" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
ic_ymd="20110101" sim_year="2000" do_transient_pfts=".false." use_excess_ice=".false."
ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
lnd_tuning_mode="clm5_0_GSWP3v1" use_init_interp=".true."
lnd_tuning_mode="clm5_0_GSWP3v1"
>lnd/clm2/initdata_esmf/ctsm5.4/clmi.f19_twiceinterp_from.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c251030.nc
</finidat>
<!-- NB: This f19 2000 finidat comes from a spin-up with use_crop=".false." -->
Expand Down
4 changes: 2 additions & 2 deletions python/ctsm/test/test_unit_subset_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def test_inputdata_setup_files_basic(self):
files = setup_files(self.args, self.defaults, self.cesmroot, testing=True)
self.assertEqual(
files["fsurf_in"],
"surfdata_0.9x1.25_hist_2000_16pfts_c240908.nc",
"surfdata_0.9x1.25_hist_2000_16pfts_c251022.nc",
"fsurf_in filename not whats expected",
)
self.assertEqual(
Expand All @@ -117,7 +117,7 @@ def test_inputdata_setup_files_basic(self):
)
self.assertEqual(
files["main_dir"],
"/glade/campaign/cesm/cesmdata/cseg/inputdata",
"/glade/campaign/cesm/cesmdata/inputdata",
"main_dir directory not whats expected",
)

Expand Down
4 changes: 2 additions & 2 deletions src/biogeophys/CanopyStateType.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,11 @@ subroutine InitHistory(this, bounds)
this%vegwp_ln_patch(begp:endp,:) = spval
call hist_addfld2d (fname='VEGWPLN', units='mm', type2d='nvegwcs', &
avgflag='A', long_name='vegetation water matric potential for sun/sha canopy,xyl,root at local noon', &
ptr_patch=this%vegwp_ln_patch, default='active')
ptr_patch=this%vegwp_ln_patch, default='inactive')
this%vegwp_pd_patch(begp:endp,:) = spval
call hist_addfld2d (fname='VEGWPPD', units='mm', type2d='nvegwcs', avgflag='A', &
long_name='predawn vegetation water matric potential for sun/sha canopy,xyl,root', &
ptr_patch=this%vegwp_pd_patch, default='active')
ptr_patch=this%vegwp_pd_patch, default='inactive')
end if

end subroutine InitHistory
Expand Down
Loading