Skip to content

Commit 6bba868

Browse files
adrifosteradrifoster
authored
Merge pull request #3058 from glemieux/fates-tests-allvars-update
ctsm5.3.042: Update `FatesColdAllVars` history output
2 parents e0104b9 + 6d1019c commit 6bba868

File tree

11 files changed

+108
-12
lines changed

11 files changed

+108
-12
lines changed

‎.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.82.3_api.39.0.0
31+
fxtag = sci.1.83.1_api.39.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_definition_ctsm.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,10 +781,9 @@ This option is older than the luhdata options and may be depricated at some poin
781781
</entry>
782782

783783
<entry id="fates_electron_transport_model" type="char*256" category="physics"
784-
group="elm_inparm" valid_values="FvCB1980,JohnsonBerry2021" value="FvCB1980">
784+
group="clm_inparm" valid_values="FvCB1980,JohnsonBerry2021" value="FvCB1980">
785785
Set the FATES electron transport model to either Johnson-Berry 2021 or
786786
Farquhar von Caemmerer and Berry 1980 (FvCB1980).
787-
788787
</entry>
789788

790789
<entry id="fates_radiation_model" type="char*256" category="physics"

‎cime_config/testdefs/ExpectedTestFails.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@
245245
</phase>
246246
</test>
247247

248-
<test name="PEM_D_Ld20.f10_f10_mg37.I2000Clm50FatesRs.derecho_gnu.clm-FatesColdSeedDisp">
249-
<phase name="COMPARE_base_modpes">
248+
<test name="PEM_D_Ld20.5x5_amazon.I2000Clm50FatesRs.derecho_gnu.clm-FatesColdSeedDisp">
249+
<phase name="RUN">
250250
<status>FAIL</status>
251-
<issue>FATES#1089</issue>
251+
<issue>#3097</issue>
252252
</phase>
253253
</test>
254254

‎cime_config/testdefs/testlist_clm.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3236,6 +3236,15 @@
32363236
<option name="comment">Ensure functionality of the tree damage option in FATES</option>
32373237
</options>
32383238
</test>
3239+
<test name="ERS_D_Ld20" grid="f45_f45_mg37" compset="I2000Clm60FatesRs" testmods="clm/FatesColdElecTransJB">
3240+
<machines>
3241+
<machine name="derecho" compiler="gnu" category="fates"/>
3242+
</machines>
3243+
<options>
3244+
<option name="wallclock">00:20:00</option>
3245+
<option name="comment">Ensure functionality of the JohnsonBerry2021 option in FATES</option>
3246+
</options>
3247+
</test>
32393248
<test name="ERI_D_Ld20" grid="f45_f45_mg37" compset="I2000Clm50FatesRs" testmods="clm/FatesColdTwoStream">
32403249
<machines>
32413250
<machine name="derecho" compiler="intel" category="fates"/>

‎cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use_fates_tree_damage = .true.
88
hist_ndens = 1
99
hist_fincl1 = 'FATES_TLONGTERM',
1010
'FATES_TGROWTH','FATES_SEEDS_IN_GRIDCELL_PF','FATES_SEEDS_OUT_GRIDCELL_PF','FATES_NCL_AP',
11-
'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDARY_ANTHRODISTAGE_AP','FATES_SECONDARY_AREA_AP',
11+
'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDARY_AREA_ANTHRO_AP','FATES_SECONDARY_AREA_AP',
1212
'FATES_FUEL_AMOUNT_APFC','FATES_STOREC_TF_USTORY_SZPF','FATES_STOREC_TF_CANOPY_SZPF',
1313
'FATES_CROWNAREA_CLLL','FATES_ABOVEGROUND_MORT_SZPF',
1414
'FATES_ABOVEGROUND_PROD_SZPF','FATES_NPLANT_SZAP','FATES_NPLANT_CANOPY_SZAP',
@@ -56,5 +56,7 @@ hist_fincl1 = 'FATES_TLONGTERM',
5656
'FATES_PARSUN_CL','FATES_PARSHA_CL','FATES_LAISUN_CLLL','FATES_LAISHA_CLLL','FATES_LAISUN_CLLLPF',
5757
'FATES_LAISHA_CLLLPF','FATES_PARPROF_DIR_CLLLPF','FATES_PARPROF_DIF_CLLLPF','FATES_LAISUN_CL','FATES_LAISHA_CL',
5858
'FATES_PARPROF_DIR_CLLL','FATES_PARPROF_DIF_CLLL','FATES_NET_C_UPTAKE_CLLL','FATES_CROWNFRAC_CLLLPF',
59-
'FATES_LBLAYER_COND_AP','FATES_STOMATAL_COND_AP','FATES_TLONGTERM','FATES_PRIMARY_AREA_AP','FATES_NPP_LU',
60-
'FATES_GPP_LU'
59+
'FATES_LBLAYER_COND_AP','FATES_STOMATAL_COND_AP','FATES_TLONGTERM','FATES_PRIMARY_AREA_AP','FATES_NPP_LU','FATES_GPP_LU',
60+
'FATES_SEED_BANK_PF','FATES_UNGERM_SEED_BANK_PF','FATES_SEEDLING_POOL_PF','FATES_SEEDS_IN_PF','FATES_SEEDS_IN_LOCAL_PF',
61+
'FATES_SAPWOOD_AREA_SZPF','FATES_CANOPYAREA','FATES_NCL','FATES_PATCHAREA','FATES_PRIMARY_AREA','FATES_SCORCH_HEIGHT_PF',
62+
'FATES_SECONDARY_AREA_ANTHRO','FATES_SECONDARY_AREA','FATES_ZSTAR'

‎cime_config/testdefs/testmods_dirs/clm/FatesColdElecTransJB/include_user_mods‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../FatesCold

‎cime_config/testdefs/testmods_dirs/clm/FatesColdElecTransJB/user_nl_clm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fates_electron_transport_model='JohnsonBerry2021'

‎doc/ChangeLog‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,87 @@
11
===============================================================
2+
Tag name: ctsm5.3.042
3+
Originator(s): glemieux (Gregory Lemieux, LBNL, [email protected])
4+
Date: Thu May 8 16:15:48 MDT 2025
5+
One-line Summary: Update FATES tag, tests and address namelist option bug
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
This pull request updates the FatesColdAllVars test list due to changes in the FATES
11+
history output associated with ngeet/fates#1252, which is coordinated with this update.
12+
A bug in which the incorrect control variable was being sent to FATES for a recently
13+
added namelist options has been addressed. The NEON-FATES-NIWO tests have also been
14+
addressed through the update of the FATES tag which includes fixes brought in with
15+
ngeet/fates#1376.
16+
17+
18+
Significant changes to scientifically-supported configurations
19+
--------------------------------------------------------------
20+
21+
Does this tag change answers significantly for any of the following physics configurations?
22+
(Details of any changes will be given in the "Answer changes" section below.)
23+
24+
[Put an [X] in the box for any configuration with significant answer changes.]
25+
26+
[ ] clm6_0
27+
28+
[ ] clm5_0
29+
30+
[ ] ctsm5_0-nwp
31+
32+
[ ] clm4_5
33+
34+
35+
Bugs fixed
36+
----------
37+
38+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
39+
- [Issue #3052: Update FatesColdAllVars history output with recent additions](https://github.com/ESCOMP/CTSM/issues/3052)
40+
- [Issue #3038: NEON-FATES-NIWO test in aux_clm fails RUN](https://github.com/ESCOMP/CTSM/issues/3038)
41+
- [Issue #3062: Incorrect value being set for FATES electron transport namelist option](https://github.com/ESCOMP/CTSM/issues/3062)
42+
43+
Notes of particular relevance for developers:
44+
---------------------------------------------
45+
Changes to tests or testing:
46+
The PEM seed dispersal test is now failing RUN, where it was previously failing COMPARE_base_modpes.
47+
This has been added to the expected failures and has been documented in a new issue, [#3097](https://github.com/ESCOMP/CTSM/issues/3097).
48+
This issue is associated with updates that came in previously with ctsm5.3.041.
49+
50+
Testing summary:
51+
----------------
52+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
53+
54+
derecho ----- OK
55+
izumi ------- OK
56+
57+
fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates-<FATES TAG>-<CTSM TAG>)
58+
derecho ----- OK
59+
izumi ------- OK
60+
61+
Notes:
62+
- All tests resulted in expected st_archive exception due to known issue [#3098](https://github.com/ESCOMP/CTSM/issues/3098)
63+
- Due to permission issues, the izumi aux_clm tests were run against ctsm5.3.040 baselines. This was deemed acceptable since ctsm5.3.041 is a b4b tag
64+
Answer changes
65+
--------------
66+
67+
Changes answers relative to baseline: Yes, but only for FATES tests
68+
This is due to updating the fates tag which includes a number of bug fixes and science updates
69+
70+
71+
Other details
72+
-------------
73+
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
74+
fates: sci.1.82.3_api.39.0.0 -> sci.1.83.1_api.39.0.0
75+
76+
Pull Requests that document the changes (include PR ids):
77+
(https://github.com/ESCOMP/ctsm/pull)
78+
https://github.com/ESCOMP/CTSM/pull/3058
79+
https://github.com/ESCOMP/CTSM/pull/3063
80+
https://github.com/NGEET/fates/pull/1252
81+
https://github.com/NGEET/fates/pull/1376
82+
83+
===============================================================
84+
===============================================================
285
Tag name: ctsm5.3.041
386
Originator(s): samrabin (Sam Rabin, UCAR/TSS)
487
Date: Fri Apr 25 08:02:37 MDT 2025

‎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.042 glemieux 05/08/2025 Update FATES tag, tests and address namelist option bug
34
ctsm5.3.041 samrabin 04/25/2025 Merge b4b-dev to master
45
ctsm5.3.040 samrabin 04/15/2025 Update ctsm_pylib to 3.13.2
56
ctsm5.3.039 afoster 04/14/2025 Create driver data structure for SP mode

‎src/fates‎

0 commit comments

Comments
 (0)