Skip to content

Commit 33b80b6

Browse files
committed
Revisions addressing code review
1 parent 2458ed9 commit 33b80b6

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed

bld/namelist_files/namelist_defaults_ctsm.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
12971297
<finidat hgrid="0.9x1.25" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
12981298
ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false." use_excess_ice=".true."
12991299
ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
1300-
phys="clm6_0"
1300+
phys="clm6_0" use_init_interp=".true."
13011301
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm53041_54surfdata_snowTherm_100_pSASU.clm2.r.0161-01-01-00000_64bitoffset.nc
13021302
</finidat>
13031303
<!-- Corresponding ne30 -->
@@ -1717,7 +1717,7 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_4x5_hist_1850_16pfts_c241007.nc</fsurd
17171717
<fsurdat hgrid="360x720cru" sim_year="1850">
17181718
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_360x720cru_hist_1850_78pfts_c240908.nc</fsurdat>
17191719
<fsurdat hgrid="0.9x1.25" sim_year="1850" >
1720-
lnd/clm2/surfdata_esmf/ctsm5.4.0/surfdata_0.9x1.25_hist_1850_78pfts_c250428.nc</fsurdat>
1720+
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_0.9x1.25_hist_1850_78pfts_c240908.nc</fsurdat>
17211721
<fsurdat hgrid="1.9x2.5" sim_year="1850" use_crop=".true.">
17221722
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1.9x2.5_hist_1850_78pfts_c240908.nc</fsurdat>
17231723
<fsurdat hgrid="10x15" sim_year="1850" >
@@ -1735,7 +1735,7 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4_hist_1850_78pfts_c240908.nc</f
17351735
<fsurdat hgrid="ne30np4.pg2" sim_year="1850">
17361736
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg2_hist_1850_78pfts_c240908.nc</fsurdat>
17371737
<fsurdat hgrid="ne30np4.pg3" sim_year="1850">
1738-
lnd/clm2/surfdata_esmf/ctsm5.4.0/surfdata_ne30np4.pg3_hist_1850_78pfts_c250428.nc</fsurdat>
1738+
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
17391739
<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
17401740
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
17411741
<fsurdat hgrid="ne3np4" sim_year="1850">
@@ -1795,7 +1795,7 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
17951795

17961796
<!-- 78-pft landuse files -->
17971797
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="1850-2000"
1798-
>lnd/clm2/surfdata_esmf/ctsm5.4.0/landuse.timeseries_0.9x1.25_hist_1850-2023_78pfts_c250428.nc</flanduse_timeseries>
1798+
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
17991799
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000" use_crop=".true."
18001800
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_1.9x2.5_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
18011801
<flanduse_timeseries hgrid="ne0np4.ARCTICGRIS.ne30x8" sim_year_range="1850-2000"
@@ -1827,7 +1827,7 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
18271827
<flanduse_timeseries hgrid="ne16np4.pg3" sim_year_range="1850-2000"
18281828
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne16np4.pg3_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
18291829
<flanduse_timeseries hgrid="ne30np4.pg3" sim_year_range="1850-2000"
1830-
>lnd/clm2/surfdata_esmf/ctsm5.4.0/landuse.timeseries_ne30np4.pg3_hist_1850-2023_78pfts_c250428.nc</flanduse_timeseries>
1830+
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne30np4.pg3_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
18311831

18321832
<flanduse_timeseries hgrid="C96" sim_year_range="1850-2000"
18331833
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_C96_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>

cime_config/testdefs/ExpectedTestFails.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,6 @@
7676
<comment>Works with finidat = 'ctsm53041_54surfdata_snowTherm_100_pSASU.clm2.r.0161-01-01-00000.nc' and fails with finidat = 'ctsm53041_54surfdata_snowTherm_100_pSASU.clm2.r.0161-01-01-00000_64bitoffset.nc'.</comment>
7777
</phase>
7878
</test>
79-
<test name="SMS_D_Ld5.f09_g17.ISSP126Clm50BgcCrop.derecho_intel.clm-default">
80-
<phase name="RUN">
81-
<status>FAIL</status>
82-
<issue>#3250</issue>
83-
<comment>SSP landuse files not available for ctsm54, yet.</comment>
84-
</phase>
85-
</test>
86-
<test name="SMS_D_Ld5.f09_g17.ISSP245Clm60BgcCropCrujra.derecho_intel.clm-default">
87-
<phase name="RUN">
88-
<status>FAIL</status>
89-
<issue>#3250</issue>
90-
<comment>SSP landuse files not available for ctsm54, yet.</comment>
91-
</phase>
92-
</test>
9379
<test name="SMS_Ld2_D_PS.f09_g17.I1850Clm50BgcCropCmip6.derecho_intel.clm-basic_interp">
9480
<phase name="RUN">
9581
<status>FAIL</status>

0 commit comments

Comments
 (0)