Skip to content

Commit b18bf0e

Browse files
ekluzekekluzek
committed
Merge remote-tracking branch 'escomp/b4b-dev' into cmake_use_function
 Conflicts: src/CMakeLists.txt
2 parents 36023cb + c9a41e0 commit b18bf0e

File tree

63 files changed

+5798
-1786
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+5798
-1786
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,4 @@ cdf40d265cc82775607a1bf25f5f527bacc97405
7676
ac03492012837799b7111607188acff9f739044a
7777
d858665d799690d73b56bcb961684382551193f4
7878
c0c6da391ee359f2765439426f3a2a4593a95343
79+
598de2f05638286b3d99ac0ed120977cbc554c3d

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fxDONOTUSEurl = https://github.com/NGEET/fates
3636
[submodule "cism"]
3737
path = components/cism
3838
url = https://github.com/ESCOMP/CISM-wrapper
39-
fxtag = cismwrap_2_2_011
39+
fxtag = cismwrap_2_2_013
4040
fxrequired = ToplevelRequired
4141
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
4242
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
@@ -76,7 +76,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
7676
[submodule "cime"]
7777
path = cime
7878
url = https://github.com/ESMCI/cime
79-
fxtag = cime6.1.144
79+
fxtag = cime6.1.146
8080
fxrequired = ToplevelRequired
8181
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
8282
fxDONOTUSEurl = https://github.com/ESMCI/cime

‎bld/namelist_files/namelist_defaults_ctsm.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
148148
<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>
149149

150150
<!-- Settings for Carbon Isotope streams -->
151-
<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>
152-
<stream_meshfile_atm_c14 use_c14=".true." use_c14_bombspike =".true." >share/meshes/360x720_120830_ESMFmesh_c20210507_cdf5.nc</stream_meshfile_atm_c14>
151+
<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>
152+
<stream_meshfile_atm_c14 use_c14=".true." use_c14_bombspike =".true." >share/meshes/360x720_120830_ESMFmesh_tweaked_latlons_c20260108.nc</stream_meshfile_atm_c14>
153153

154154
<!-- The following are only set if both use_c14 and use_c14_bombspike are TRUE -->
155155
<stream_year_first_atm_c14 sim_year="2018" sim_year_range="constant">2018</stream_year_first_atm_c14>
@@ -622,7 +622,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
622622
<!-- The default filenames are given relative to the root directory
623623
for the CLM2 data in the CESM distribution -->
624624
<!-- Plant function types (relative to {csmdata}) -->
625-
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c251211.nc</paramfile>
625+
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c260108.nc</paramfile>
626626
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c250311.nc</paramfile>
627627
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c250311.nc</paramfile>
628628

@@ -703,6 +703,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
703703

704704
<generate_crop_gdds >.false.</generate_crop_gdds>
705705
<use_mxmat >.true.</use_mxmat>
706+
<suppress_gddmaturity_warning >.false.</suppress_gddmaturity_warning>
706707

707708
<!-- use additional stress deciduous onset trigger -->
708709
<constrain_stress_deciduous_onset >.true.</constrain_stress_deciduous_onset>
@@ -926,9 +927,11 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
926927
<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." phys="clm6_0" use_cn=".false."
927928
>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.
928929
</init_interp_attributes>
930+
<!-- For now comment this out, until we also have an SP finidat file to use
929931
<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." phys="clm6_0" use_cn=".false."
930932
>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.
931933
</init_interp_attributes>
934+
-->
932935

933936
<init_interp_attributes sim_year="2000" use_cndv=".false." use_fates=".false." phys="clm6_0" use_cn=".false."
934937
>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.
@@ -1419,12 +1422,14 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
14191422
phys="clm6_0"
14201423
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_SP_f09_127_1850.clm2.r.0102-01-01-00000.nc
14211424
</finidat>
1425+
<!-- comment out the SP case and use the BGC case for now
14221426
<finidat hgrid="ne30np4.pg3" maxpft="17" mask="tx2_3v2" use_cn=".false." use_cndv=".false." use_fates=".false."
14231427
ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false." use_excess_ice=".true."
14241428
ic_tod="0" glc_nec="10" use_crop=".false."
14251429
phys="clm6_0"
14261430
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_SP_ne30_126_1850.clm2.r.0102-01-01-00000.nc
14271431
</finidat>
1432+
-->
14281433

14291434
<finidat hgrid="0.9x1.25" maxpft="17" mask="tx2_3v2" use_cn=".false." use_cndv=".false." use_fates=".false."
14301435
ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false." use_excess_ice=".true."
@@ -1446,12 +1451,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
14461451
phys="clm6_0"
14471452
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_f09_124_pSASU.clm2.r.0161-01-01-00000.nc
14481453
</finidat>
1449-
<!-- Corresponding ne30 -->
1454+
<!-- ne30 case with the Greenland snow "hole" patched -->
14501455
<finidat hgrid="ne30np4.pg3" mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."
14511456
sim_year="1850" do_transient_pfts=".false." use_excess_ice=".true."
14521457
use_crop=".true."
14531458
phys="clm6_0"
1454-
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.3.075_ne30_123_pSASU.clm2.r.0161-01-01-00000.nc
1459+
>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
14551460
</finidat>
14561461
<!-- Corresponding f19 -->
14571462
<finidat hgrid="1.9x2.5" mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."

‎bld/namelist_files/namelist_definition_ctsm.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,6 +1484,11 @@ Set to .true. in order to override crop harvesting logic and to instead harvest
14841484
Set to .false. in order to ignore crop PFT parameter for maximum growing season length (mxmat). Must be set to .false. when generate_crop_gdds is .true.
14851485
</entry>
14861486

1487+
<entry id="suppress_gddmaturity_warning" type="logical" category="physics"
1488+
group="cnphenology" valid_values="" value=".false.">
1489+
If set to .true., suppress the warning message when a prescribed cultivar GDD requirement is below the minimum allowed value and is replaced with min_gddmaturity. Useful when using prescribed crop calendars with intentionally low GDD requirements.
1490+
</entry>
1491+
14871492
<entry id="min_critical_dayl_method" type="char*25" category="physics"
14881493
group="cnphenology" valid_values="Constant,DependsOnLat,DependsOnVeg,DependsOnLatAndVeg">
14891494
Method for determining what the minimum critical day length for seasonal decidious leaf offset depends on

‎cime‎

‎cime_config/SystemTests/rxcropmaturity.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ def _run_generate_gdds(self, case_gddgen):
448448
f"--hdates-file {hdates_file}",
449449
f"--output-dir generate_gdds_out",
450450
f"--skip-crops miscanthus,irrigated_miscanthus,switchgrass,irrigated_switchgrass",
451+
"--max-season-length-from-hdates-file",
451452
]
452453
)
453454
stu.run_python_script(

‎cime_config/config_compsets.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,21 @@
702702
</compset>
703703

704704
<!-- Latest CLM version -->
705+
<compset>
706+
<alias>I1850Clm60SpG</alias>
707+
<lname>1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
708+
</compset>
709+
710+
<compset>
711+
<alias>I1850Clm60SpGa</alias>
712+
<lname>1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_CISM2%AIS-EVOLVE_SWAV</lname>
713+
</compset>
714+
715+
<compset>
716+
<alias>I1850Clm60SpGag</alias>
717+
<lname>1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_CISM2%AIS-EVOLVE%GRIS-EVOLVE_SWAV</lname>
718+
</compset>
719+
705720
<compset>
706721
<alias>I1850Clm60BgcCropG</alias>
707722
<lname>1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
@@ -731,6 +746,11 @@
731746
<lname>1850_DATM%GSWP3v1_CLM50%SP_SICE_SOCN_SROF_CISM2%AIS-EVOLVE%GRIS-EVOLVE_SWAV</lname>
732747
</compset>
733748

749+
<compset>
750+
<alias>I1850Clm60SpRsGag</alias>
751+
<lname>1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_CISM2%AIS-EVOLVE%GRIS-EVOLVE_SWAV</lname>
752+
</compset>
753+
734754
<compset>
735755
<alias>I1850Clm60SpRs</alias>
736756
<lname>1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV</lname>

‎cime_config/testdefs/ExpectedTestFails.xml‎

Lines changed: 21 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,27 @@
3636
</phase>
3737
</test>
3838

39+
<test name="RXCROPMATURITY_Lm61.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput">
40+
<phase name="RUN">
41+
<status>FAIL</status>
42+
<issue>#3740</issue>
43+
</phase>
44+
</test>
45+
46+
<test name="RXCROPMATURITY_Lm61.f09_t232.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput">
47+
<phase name="RUN">
48+
<status>FAIL</status>
49+
<issue>#3740</issue>
50+
</phase>
51+
</test>
52+
53+
<test name="RXCROPMATURITY_Lm61.f09_g17.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput">
54+
<phase name="RUN">
55+
<status>FAIL</status>
56+
<issue>#3740</issue>
57+
</phase>
58+
</test>
59+
3960
<test name="SMS_Ld5.f09_g17.IHistClm50Sp.derecho_intel.clm-nofire">
4061
<phase name="SHAREDLIB_BUILD">
4162
<status>FAIL</status>
@@ -76,12 +97,6 @@
7697
<comment>Restart issues with default "inactive" fields added to history by hist_all_fields.</comment>
7798
</phase>
7899
</test>
79-
<test name="MKSURFDATAESMF_P128x1.f10_f10_mg37.I1850Clm50BgcCrop.derecho_intel">
80-
<phase name="NLCOMP">
81-
<status>FAIL</status>
82-
<issue>#3453</issue>
83-
</phase>
84-
</test>
85100
<test name="SUBSETDATAPOINT_Ld5_D_Mmpi-serial.CLM_USRDAT.I2000Clm60BgcCropCrujra.derecho_intel.clm-default">
86101
<phase name="NLCOMP">
87102
<status>FAIL</status>
@@ -168,100 +183,20 @@
168183
</phase>
169184
</test>
170185

171-
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.derecho_gnu.clm-default--clm-NEON-HARV">
172-
<phase name="SHAREDLIB_BUILD">
173-
<status>FAIL</status>
174-
<issue>#2310</issue>
175-
</phase>
176-
</test>
177-
178-
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.derecho_gnu.clm-NEON-MOAB--clm-PRISM">
179-
<phase name="SHAREDLIB_BUILD">
180-
<status>FAIL</status>
181-
<issue>#2310</issue>
182-
</phase>
183-
<phase name="RUN">
184-
<status>FAIL</status>
185-
<issue>#2310</issue>
186-
</phase>
187-
</test>
188-
189186
<test name="FUNITCTSM_P1x1.f10_f10_mg37.I2000Clm50Sp.izumi_intel">
190187
<phase name="RUN">
191188
<status>FAIL</status>
192189
<issue>#3182</issue>
193190
</phase>
194191
</test>
195192

196-
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-default--clm-NEON-HARV--clm-matrixcnOn">
197-
<phase name="RUN">
198-
<status>FAIL</status>
199-
<issue>#2310</issue>
200-
</phase>
201-
</test>
202-
203-
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-NEON-MOAB--clm-PRISM">
204-
<phase name="SHAREDLIB_BUILD">
205-
<status>FAIL</status>
206-
<issue>#2310</issue>
207-
</phase>
208-
<phase name="RUN">
209-
<status>FAIL</status>
210-
<issue>#2310</issue>
211-
</phase>
212-
</test>
213-
214-
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.derecho_gnu.clm-FatesPRISM--clm-NEON-FATES-YELL">
215-
<phase name="SHAREDLIB_BUILD">
216-
<status>FAIL</status>
217-
<issue>#2310</issue>
218-
</phase>
219-
<phase name="RUN">
220-
<status>FAIL</status>
221-
<issue>#2310</issue>
222-
</phase>
223-
</test>
224-
225-
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60SpRs.derecho_gnu.clm-default--clm-NEON-TOOL">
226-
<phase name="SHAREDLIB_BUILD">
227-
<status>FAIL</status>
228-
<issue>#2310</issue>
229-
</phase>
230-
<phase name="RUN">
231-
<status>FAIL</status>
232-
<issue>#2310</issue>
233-
</phase>
234-
</test>
235-
236193
<test name="ERS_Ld60.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdST3">
237194
<phase name="RUN">
238195
<status>FAIL</status>
239196
<issue>#2867</issue>
240197
</phase>
241198
</test>
242199

243-
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.izumi_nag.clm-FatesFireLightningPopDens--clm-NEON-FATES-NIWO">
244-
<phase name="SHAREDLIB_BUILD">
245-
<status>FAIL</status>
246-
<issue>#2310</issue>
247-
</phase>
248-
<phase name="RUN">
249-
<status>FAIL</status>
250-
<issue>#2310</issue>
251-
</phase>
252-
</test>
253-
254-
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.izumi_nag.clm-FatesPRISM--clm-NEON-FATES-YELL">
255-
<phase name="SHAREDLIB_BUILD">
256-
<status>FAIL</status>
257-
<issue>#2310</issue>
258-
</phase>
259-
<phase name="RUN">
260-
<status>FAIL</status>
261-
<issue>#2310</issue>
262-
</phase>
263-
</test>
264-
265200
<!-- fates test suite failures -->
266201

267202
<!-- This is commented out because cime currently does NOT allow longnames in the XML in the XSD for this file
@@ -323,17 +258,6 @@
323258
</phase>
324259
</test>
325260

326-
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.derecho_intel.clm-FatesFireLightningPopDens--clm-NEON-FATES-NIWO">
327-
<phase name="SHAREDLIB_BUILD">
328-
<status>FAIL</status>
329-
<issue>#2310</issue>
330-
</phase>
331-
<phase name="RUN">
332-
<status>FAIL</status>
333-
<issue>#3038</issue>
334-
</phase>
335-
</test>
336-
337261
<test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdLandUse">
338262
<phase name="SHAREDLIB_BUILD">
339263
<status>FAIL</status>
@@ -375,19 +299,6 @@
375299

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

378-
<test name="ERR_Ld7.f10_f10_mg37.I2000Clm50BgcCropRtm.derecho_gnu.clm-default">
379-
<phase name="COMPARE_base_rest">
380-
<status>FAIL</status>
381-
<issue>#3383</issue>
382-
</phase>
383-
</test>
384-
385-
<test name="ERR_Ld7.f10_f10_mg37.IHistClm60BgcCrop.derecho_gnu.clm-default">
386-
<phase name="COMPARE_base_rest">
387-
<status>FAIL</status>
388-
<issue>#3383</issue>
389-
</phase>
390-
</test>
391302
<test name="ERI_Ld41.f10_f10_mg37.I2000Clm60BgcCrop.derecho_gnu.clm-default">
392303
<phase name="COMPARE_base_hybrid">
393304
<status>FAIL</status>

‎cime_config/testdefs/testlist_clm.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,15 @@
261261
<option name="comment">Repeat CESM3 development test with Crujra while Gswp is still the default</option>
262262
</options>
263263
</test>
264+
<test name="ERS_Ly3" grid="f10_f10_ais8gris4_mg37" compset="I1850Clm60SpGag">
265+
<machines>
266+
<machine name="derecho" compiler="intel" category="aux_clm"/>
267+
</machines>
268+
<options>
269+
<option name="wallclock">1:00:00</option>
270+
<option name="comment">Mid-year exact restart test. Also covers multiple ice sheets in a multi-year I compset test.</option>
271+
</options>
272+
</test>
264273
<test name="SMS" grid="ne30pg3_t232" compset="I2000Clm60BgcCrop" testmods="clm/clm60cam7LndTuningMode">
265274
<machines>
266275
<machine name="derecho" compiler="intel" category="aux_clm"/>

‎cime_config/testdefs/testmods_dirs/clm/crop/user_nl_clm‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ hist_fincl2 += 'DYN_COL_SOIL_ADJUSTMENTS_C'
1313
! Note that, under normal circumstances, these should only be saved annually.
1414
! That's needed for the mxsowings and mxharvests axes to make sense.
1515
! However, for testing purposes, it makes sense to save more frequently.
16-
hist_fincl3 = 'SDATES', 'SDATES_PERHARV', 'SYEARS_PERHARV', 'HDATES', 'GRAINC_TO_FOOD_PERHARV', 'GRAINC_TO_FOOD_ANN', 'GRAINN_TO_FOOD_PERHARV', 'GRAINN_TO_FOOD_ANN', 'GRAINC_TO_SEED_PERHARV', 'GRAINC_TO_SEED_ANN', 'GRAINN_TO_SEED_PERHARV', 'GRAINN_TO_SEED_ANN', 'HDATES', 'GDDHARV_PERHARV', 'GDDACCUM_PERHARV', 'HUI_PERHARV', 'SOWING_REASON_PERHARV', 'HARVEST_REASON_PERHARV', 'SWINDOW_STARTS', 'SWINDOW_ENDS', 'GDD20_BASELINE', 'GDD20_SEASON_START', 'GDD20_SEASON_END'
16+
hist_fincl3 = 'SDATES', 'SDATES_PERHARV', 'SYEARS_PERHARV', 'HDATES', 'GRAINC_TO_FOOD_PERHARV', 'GRAINC_TO_FOOD_ANN', 'GRAINN_TO_FOOD_PERHARV', 'GRAINN_TO_FOOD_ANN', 'GRAINC_TO_SEED_PERHARV', 'GRAINC_TO_SEED_ANN', 'GRAINN_TO_SEED_PERHARV', 'GRAINN_TO_SEED_ANN', 'HDATES', 'GDDHARV_PERHARV', 'GDDACCUM_PERHARV', 'HUI_PERHARV', 'SOWING_REASON_PERHARV', 'HARVEST_REASON_PERHARV', 'SWINDOW_STARTS', 'SWINDOW_ENDS', 'GDD20_BASELINE', 'GDD20_SEASON_START', 'GDD20_SEASON_END', 'MAX_TLAI_PERHARV'
17+
hist_fincl3 += 'FROOTC_AT_EMERGENCE_PERHARV', 'FROOTC_AT_ANTHESIS_PERHARV', 'FROOTC_AT_MATURITY_PERHARV', 'FROOTC_AT_HARVEST_PERHARV'
18+
hist_fincl3 += 'LIVECROOTC_AT_EMERGENCE_PERHARV', 'LIVECROOTC_AT_ANTHESIS_PERHARV', 'LIVECROOTC_AT_MATURITY_PERHARV', 'LIVECROOTC_AT_HARVEST_PERHARV'
19+
hist_fincl3 += 'LIVESTEMC_AT_EMERGENCE_PERHARV', 'LIVESTEMC_AT_ANTHESIS_PERHARV', 'LIVESTEMC_AT_MATURITY_PERHARV', 'LIVESTEMC_AT_HARVEST_PERHARV'
20+
hist_fincl3 += 'LEAFC_AT_EMERGENCE_PERHARV', 'LEAFC_AT_ANTHESIS_PERHARV', 'LEAFC_AT_MATURITY_PERHARV', 'LEAFC_AT_HARVEST_PERHARV'
21+
hist_fincl3 += 'REPRC_AT_EMERGENCE_PERHARV', 'REPRC_AT_ANTHESIS_PERHARV', 'REPRC_AT_MATURITY_PERHARV', 'REPRC_AT_HARVEST_PERHARV'
1722
hist_nhtfrq = -24,-8,-24
1823
hist_mfilt = 1,1,1
1924
hist_type1d_pertape(3) = 'PFTS'

0 commit comments

Comments
 (0)