Skip to content

Commit bb7bc6c

Browse files
authored
Merge pull request #3087 from glemieux/fates-default-param-tag-update
ctsm5.3.045: Update FATES tag and default parameter file (API 40)
2 parents 299480f + 293d1af commit bb7bc6c

6 files changed

Lines changed: 97 additions & 10 deletions

File tree

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
[submodule "fates"]
2929
path = src/fates
3030
url = https://github.com/NGEET/fates
31-
fxtag = sci.1.83.1_api.39.0.0
31+
fxtag = sci.1.84.0_api.40.0.0
3232
fxrequired = AlwaysRequired
3333
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
3434
fxDONOTUSEurl = https://github.com/NGEET/fates

bld/namelist_files/namelist_defaults_ctsm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
540540
<!-- FATES default parameter file -->
541541
<!-- ================================================================== -->
542542

543-
<fates_paramfile>lnd/clm2/paramdata/fates_params_api.38.0.0_14pft_c250226.nc</fates_paramfile>
543+
<fates_paramfile>lnd/clm2/paramdata/fates_params_api.40.0.0_14pft_c250512.nc</fates_paramfile>
544544

545545

546546
<!-- ================================================================== -->

cime_config/testdefs/testlist_clm.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
<machine name="izumi" compiler="nag" category="aux_clm"/>
151151
</machines>
152152
<options>
153-
<option name="wallclock">00:20:00</option>
153+
<option name="wallclock">00:30:00</option>
154154
<option name="comment">CESM3 development Exact restart test with change in the processor count at f10, for izumi nag</option>
155155
</options>
156156
</test>
@@ -567,7 +567,7 @@
567567
<machine name="izumi" compiler="nag" category="aux_clm"/>
568568
</machines>
569569
<options>
570-
<option name="wallclock">00:20:00</option>
570+
<option name="wallclock">00:30:00</option>
571571
<option name="comment">Include an excess ice test starting up from streams</option>
572572
</options>
573573
</test>
@@ -1330,7 +1330,7 @@
13301330
<machine name="izumi" compiler="nag" category="aux_clm"/>
13311331
</machines>
13321332
<options>
1333-
<option name="wallclock">00:20:00</option>
1333+
<option name="wallclock">00:30:00</option>
13341334
</options>
13351335
</test>
13361336
<test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I1850Clm60Bgc" testmods="clm/ciso--clm/matrixcnOn">
@@ -1406,7 +1406,7 @@
14061406
<machine name="izumi" compiler="nag" category="aux_clm"/>
14071407
</machines>
14081408
<options>
1409-
<option name="wallclock">00:20:00</option>
1409+
<option name="wallclock">00:30:00</option>
14101410
</options>
14111411
</test>
14121412
<test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/o3lombardozzi2015">
@@ -1602,7 +1602,7 @@
16021602
<machine name="izumi" compiler="nag" category="matrixcn"/>
16031603
</machines>
16041604
<options>
1605-
<option name="wallclock">00:20:00</option>
1605+
<option name="wallclock">00:30:00</option>
16061606
<option name="comment">Repeat ERP_D_P48x1...decStart test with matrixcnOn</option>
16071607
</options>
16081608
</test>
@@ -2999,7 +2999,7 @@
29992999
<machine name="izumi" compiler="nag" category="aux_clm"/>
30003000
</machines>
30013001
<options>
3002-
<option name="wallclock">00:20:00</option>
3002+
<option name="wallclock">00:30:00</option>
30033003
</options>
30043004
</test>
30053005
<test name="SMS_Ld5_D_P48x1" grid="f10_f10_mg37" compset="IHistClm60Bgc" testmods="clm/decStart">
@@ -3261,7 +3261,7 @@
32613261
<machine name="izumi" compiler="nag" category="aux_clm"/>
32623262
</machines>
32633263
<options>
3264-
<option name="wallclock">00:30:00</option>
3264+
<option name="wallclock">00:40:00</option>
32653265
<option name="comment">Ensure functionality of two-stream radiation option in FATES</option>
32663266
</options>
32673267
</test>

doc/ChangeLog

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,90 @@
11
===============================================================
2+
Tag name: ctsm5.3.045
3+
Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov)
4+
Date: Tue May 20 11:56:15 MDT 2025
5+
One-line Summary: FATES default parameter update for API 40
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
Update the FATES default parameter and associated tag to API 40. This update
11+
includes changes to the default competitive exclusion parameter, sets the logging
12+
default to clear cut, and refactors the pft-specific phenology habit selection.
13+
14+
Significant changes to scientifically-supported configurations
15+
--------------------------------------------------------------
16+
17+
Does this tag change answers significantly for any of the following physics configurations?
18+
(Details of any changes will be given in the "Answer changes" section below.)
19+
20+
[Put an [X] in the box for any configuration with significant answer changes.]
21+
22+
[ ] clm6_0
23+
24+
[ ] clm5_0
25+
26+
[ ] ctsm5_0-nwp
27+
28+
[ ] clm4_5
29+
30+
31+
Notes of particular relevance for users
32+
---------------------------------------
33+
Changes to the datasets (e.g., parameter, surface or initial files):
34+
The FATES default parameter file update unifies the pft-level phenology habit from three
35+
separate on/off switches, into one per-pft integer selection switch, fates_phen_leaf_habit
36+
37+
Notes of particular relevance for developers:
38+
---------------------------------------------
39+
Changes to tests or testing:
40+
Wall clock time increased by ten minutes for a select set of izumi tests.
41+
42+
43+
Testing summary:
44+
----------------
45+
46+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
47+
48+
derecho ----- OK
49+
izumi -------
50+
51+
fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates-<FATES TAG>-<CTSM TAG>)
52+
derecho ----- OK
53+
izumi ------- OK
54+
55+
any other testing (give details below):
56+
57+
ctsm_sci
58+
derecho ----
59+
60+
If the tag used for baseline comparisons was NOT the previous tag, note that here:
61+
62+
fates tested against fates-sci.1.84.0_api.40.0.0-ctsm5.3.042-pr1358-1359
63+
64+
Answer changes
65+
--------------
66+
67+
Changes answers relative to baseline: yes, fates tests only
68+
69+
FIELDLIST differences due to competetive exclusion parameter update triggering inclusion
70+
of a previously inactive history output. Numerical preciscion differences in a subset of
71+
carbon flux outputs. Long term tests demonstrate roundoff differences propagated due
72+
to competetive exclusion parameter update.
73+
74+
Other details
75+
-------------
76+
77+
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
78+
fates: sci.1.83.1_api.39.0.0 -> sci.1.84.0_api.40.0.0
79+
80+
Pull Requests that document the changes (include PR ids):
81+
(https://github.com/ESCOMP/ctsm/pull)
82+
83+
https://github.com/ESCOMP/CTSM/pull/3087
84+
https://github.com/NGEET/fates/pull/1406
85+
86+
===============================================================
87+
===============================================================
288
Tag name: ctsm5.3.044
389
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
490
Date: Wed 14 May 2025 11:42:41 AM MDT

doc/ChangeSum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Tag Who Date Summary
22
============================================================================================================================
3+
ctsm5.3.045 glemieux 05/20/2025 FATES default parameter update for API 40
34
ctsm5.3.044 slevis 05/14/2025 Introduce time-evolving LEAFCN_TARGET as function of leafcn param
45
ctsm5.3.043 slevis 05/09/2025 Merge b4b-dev
56
ctsm5.3.042 glemieux 05/08/2025 Update FATES tag, tests and address namelist option bug

0 commit comments

Comments
 (0)