Skip to content

Commit d1d21a6

Browse files
authored
Merge pull request #4118 from samsrabin/merge-master-b4bdev-20260709
Merge ctsm5.4.047 to b4b-dev
2 parents 0b9cd04 + be4aa59 commit d1d21a6

9 files changed

Lines changed: 180 additions & 46 deletions

File tree

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
[submodule "fates"]
2929
path = src/fates
3030
url = https://github.com/NGEET/fates
31-
fxtag = sci.1.92.5_api.46.0.0
31+
fxtag = sci.1.92.7_api.46.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
3535

3636
[submodule "cism"]
3737
path = components/cism
3838
url = https://github.com/ESCOMP/CISM-wrapper
39-
fxtag = cismwrap_2_2_013
39+
fxtag = cismwrap_2_2_015
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
@@ -60,7 +60,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
6060
[submodule "mizuRoute"]
6161
path = components/mizuRoute
6262
url = https://github.com/ESCOMP/mizuRoute
63-
fxtag = v3.0.1
63+
fxtag = v3.1.1
6464
fxrequired = ToplevelRequired
6565
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
6666
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute

cime_config/testdefs/ExpectedTestFails.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,6 @@
178178
</phase>
179179
</test>
180180

181-
<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_gnu.mizuroute-default">
182-
<phase name="RUN">
183-
<status>FAIL</status>
184-
<issue>ESCOMP/mizuRoute#613</issue>
185-
</phase>
186-
</test>
187-
188181
<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_gnu.mizuroute-default">
189182
<phase name="NLCOMP">
190183
<status>FAIL</status>
@@ -200,9 +193,9 @@
200193
</test>
201194

202195
<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default">
203-
<phase name="MODEL_BUILD">
196+
<phase name="RUN">
204197
<status>FAIL</status>
205-
<issue>ESCOMP/mizuRoute#615</issue>
198+
<issue>ESCOMP/mizuRoute#636</issue>
206199
</phase>
207200
</test>
208201

cime_config/testdefs/testlist_clm.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@
862862
<machine name="izumi" compiler="nag" category="aux_clm"/>
863863
</machines>
864864
<options>
865-
<option name="wallclock">00:20:00</option>
865+
<option name="wallclock">00:40:00</option>
866866
<option name="comment">ERI test for a transient case across the year boundary, with the restart on the first year side (DEBUG to work on izumi_nag)</option>
867867
</options>
868868
</test>
@@ -4411,6 +4411,16 @@
44114411
<option name="comment">Add to CESM testing because mizuRoute can be sensitive to submodule changes</option>
44124412
</options>
44134413
</test>
4414+
<test name="ERS_D_Ld10" grid="5x5_amazon_r05" compset="I2000Clm60SpMizGs" testmods="mizuroute-default">
4415+
<machines>
4416+
<machine name="izumi" compiler="nag" category="aux_clm"/>
4417+
</machines>
4418+
<options>
4419+
<option name="wallclock">00:20:00</option>
4420+
<option name="comment">Parallel test of mizuRoute for the tiny 5x5_amazon r05 grid</option>
4421+
<option name="comment">Add to CESM testing because mizuRoute can be sensitive to submodule changes</option>
4422+
</options>
4423+
</test>
44144424
<test name="ERI_Ld30" grid="nldas2_nldas2_rUSGS_mnldas2" compset="I2000Clm60SpMizGsNldas" testmods="mizuroute-default">
44154425
<machines>
44164426
<machine name="derecho" compiler="intel" category="ctsm_sci"/>

cime_config/usermods_dirs/clm/fates_sp/user_nl_clm

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,3 @@ fates_spitfire_mode = 0
77
use_fates_fixed_biogeog = .true.
88
use_fates_nocomp = .true.
99
hist_ndens = 1
10-
! Turn off a list of fields that are not needed for FATES-SP mode
11-
hist_fexcl1 = 'FATES_TRIMMING', 'FATES_COLD_STATUS', 'FATES_GDD', 'FATES_NCHILLDAYS',
12-
'FATES_NCOLDDAYS', 'FATES_DAYSINCE_COLDLEAFOFF', 'FATES_DAYSINCE_COLDLEAFON',
13-
'FATES_CANOPY_SPREAD', 'FATES_VEGC_PF',
14-
'FATES_STOREC_PF', 'FATES_RECRUITMENT_PF', 'FATES_MORTALITY_PF', 'FATES_PATCHAREA_AP', 'FATES_LAI_AP',
15-
'FATES_CANOPYAREA_AP', 'FATES_NESTEROV_INDEX', 'FATES_IGNITIONS', 'FATES_FDI', 'FATES_ROS', 'FATES_EFFECT_WSPEED',
16-
'FATES_FUELCONSUMED', 'FATES_FIRE_INTENSITY', 'FATES_FIRE_INTENSITY_BURNFRAC', 'FATES_BURNFRAC', 'FATES_FUEL_MEF',
17-
'FATES_FUEL_BULKD', 'FATES_FUEL_EFF_MOIST', 'FATES_FUEL_SAV', 'FATES_FUEL_AMOUNT', 'FATES_FRAGMENTATION_SCALER_SL',
18-
'FATES_FUEL_MOISTURE_FC', 'FATES_FUEL_AMOUNT_FC', 'FATES_BURNFRAC_AP', 'FATES_FIRE_INTENSITY_BURNFRAC_AP',
19-
'FATES_FUEL_AMOUNT_AP', 'FATES_FUEL_BURNT_BURNFRAC_FC', 'FATES_LITTER_IN', 'FATES_LITTER_OUT', 'FATES_SEED_BANK',
20-
'FATES_SEEDS_IN', 'FATES_LITTER_IN_EL', 'FATES_LITTER_OUT_EL', 'FATES_SEED_BANK_EL', 'FATES_SEEDS_IN_LOCAL_EL',
21-
'FATES_SEEDS_IN_EXTERN_EL', 'FATES_SEED_GERM_EL', 'FATES_SEED_DECAY_EL', 'FATES_STOREC', 'FATES_VEGC',
22-
'FATES_SAPWOODC', 'FATES_FROOTC', 'FATES_REPROC', 'FATES_STRUCTC', 'FATES_NONSTRUCTC',
23-
'FATES_VEGC_ABOVEGROUND', 'FATES_CANOPY_VEGC', 'FATES_USTORY_VEGC', 'FATES_PRIMARY_PATCHFUSION_ERR',
24-
'FATES_DISTURBANCE_RATE_FIRE', 'FATES_DISTURBANCE_RATE_LOGGING', 'FATES_DISTURBANCE_RATE_TREEFALL',
25-
'FATES_HARVEST_WOODPROD_C_FLUX', 'FATES_GPP_CANOPY', 'FATES_AUTORESP_CANOPY',
26-
'FATES_GPP_USTORY', 'FATES_AUTORESP_USTORY', 'FATES_CROWNAREA_CL', 'FATES_DEMOTION_CARBONFLUX',
27-
'FATES_PROMOTION_CARBONFLUX', 'FATES_MORTALITY_CFLUX_CANOPY', 'FATES_MORTALITY_CFLUX_USTORY',
28-
'FATES_DDBH_CANOPY_SZ', 'FATES_DDBH_USTORY_SZ', 'FATES_BASALAREA_SZ',
29-
'FATES_VEGC_ABOVEGROUND_SZ', 'FATES_LAI_CANOPY_SZ', 'FATES_MORTALITY_CANOPY_SZ', 'FATES_NPLANT_USTORY_SZ',
30-
'FATES_LAI_USTORY_SZ', 'FATES_NPLANT_SZ', 'FATES_NPLANT_AC', 'FATES_MORTALITY_BACKGROUND_SZ',
31-
'FATES_MORTALITY_HYDRAULIC_SZ', 'FATES_MORTALITY_CSTARV_SZ', 'FATES_MORTALITY_IMPACT_SZ',
32-
'FATES_MORTALITY_FIRE_SZ', 'FATES_MORTALITY_TERMINATION_SZ', 'FATES_MORTALITY_LOGGING_SZ',
33-
'FATES_MORTALITY_FREEZING_SZ', 'FATES_MORTALITY_SENESCENCE_SZ', 'FATES_MORTALITY_AGESCEN_SZ',
34-
'FATES_MORTALITY_AGESCEN_AC', 'FATES_MORTALITY_USTORY_SZ', 'FATES_FROOTMAINTAR', 'FATES_CROOTMAINTAR',
35-
'FATES_LSTEMMAINTAR', 'FATES_NEP', 'FATES_HET_RESP', 'FATES_FIRE_CLOSS', 'FATES_FIRE_FLUX_EL',
36-
'FATES_LITTER_AG_FINE_EL', 'FATES_LITTER_BG_FINE_EL', 'FATES_LITTER_BG_CWD_EL', 'FATES_LITTER_AG_CWD_EL',
37-
'FATES_LITTER_CWD_ELDC', 'FATES_LEAF_ALLOC', 'FATES_SEED_ALLOC', 'FATES_STEM_ALLOC', 'FATES_FROOT_ALLOC',
38-
'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC', 'FATES_AUTORESP', 'FATES_GROWTH_RESP',
39-
'FATES_LEAFMAINTAR', 'FATES_MAINT_RESP', 'FATES_NPP', 'FATES_NPP_PF'

components/mizuRoute

Submodule mizuRoute updated 67 files

doc/ChangeLog

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,162 @@
11
===============================================================
2+
Tag name: ctsm5.4.047
3+
Originator(s): samrabin (Sam Rabin, UCAR/TSS)
4+
Date: Fri Jul 10 09:03:46 MDT 2026
5+
One-line Summary: b4b-dev merge 2026-07-10
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
Merge b4b-dev to master. Includes:
11+
- [ESCOMP/CTSM Pull Request #3666: b4b: Move the changes to initialize the task decomposition from mpi_scan to main development by ekluzek](https://github.com/ESCOMP/CTSM/pull/3666)
12+
13+
14+
Testing summary:
15+
----------------
16+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
17+
18+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
19+
20+
derecho ----- OK
21+
izumi ------- OK
22+
23+
Other details
24+
-------------
25+
26+
Pull Requests that document the changes (include PR ids):
27+
- [ESCOMP/CTSM Pull Request #4114: ctsm5.4.047: b4b-dev merge 2026-07-09](https://github.com/ESCOMP/CTSM/pull/4114)
28+
29+
===============================================================
30+
===============================================================
31+
Tag name: ctsm5.4.046
32+
Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov)
33+
Date: Mon Jun 22 10:25:13 MDT 2026
34+
One-line Summary: Remove variables to exclude for fates_sp user mod
35+
36+
Purpose and description of changes
37+
----------------------------------
38+
39+
Removes the hist_fexcl fields in the fates_sp user mod. Coordinated with NGEET/fates#1568, which adds satellite phenology mode aware logic to automatically set the active/inactive FATES history variables.
40+
41+
42+
Notes of particular relevance for developers:
43+
---------------------------------------------
44+
45+
Changes to tests or testing: Fieldlist diffs.
46+
47+
Testing summary:
48+
----------------
49+
50+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
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+
62+
Other details
63+
-------------
64+
65+
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
66+
- fates: sci.1.92.5_api.46.0.0 → sci.1.92.7_api.46.0.0
67+
68+
Pull Requests that document the changes (include PR ids):
69+
- [ESCOMP/CTSM Pull Request #4079: ctsm5.4.046: Remove variables to exclude for `fates_sp` user mod by glemieux](https://github.com/ESCOMP/CTSM/pull/4079)
70+
71+
===============================================================
72+
===============================================================
73+
Tag name: ctsm5.4.045
74+
Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
75+
Date: Mon Jun 15 11:35:27 AM MDT 2026
76+
One-line Summary: Update mizuRoute and CISM submodules
77+
78+
Purpose and description of changes
79+
----------------------------------
80+
81+
Update the submodules for CISM and also for mizuRoute
82+
83+
This changes answers for compsets with CISM and also for compsets that use mizuRoute. We currently don't test both of them together.
84+
85+
Bugs fixed
86+
----------
87+
88+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
89+
90+
Work on Get the mizu testlist working #3808
91+
Was fixed ESCOMP/mizuRoute/Single-point mode incompatible with parallel I/O netcdf? Suggestion to change documentation. #613
92+
Was fixed ESCOMP/mizuRoute/Document what we want covered in system tests #615
93+
Fixes Going to a CISM active test for a processor change test (PEM), causes answers to change... #2542
94+
95+
Notes of particular relevance for users
96+
---------------------------------------
97+
98+
Changes made to namelist defaults (e.g., changed parameter values):
99+
Changes some mizuRoute defaults as shown below under answer changing section
100+
101+
Contributors: @nmizukami, @kate
102+
103+
Notes of particular relevance for developers:
104+
---------------------------------------------
105+
106+
Changes to tests or testing:
107+
Add a working test for izumi_nag
108+
109+
Testing summary: regular + ctsm_sci
110+
----------------
111+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
112+
113+
build-namelist tests (if CLMBuildNamelist.pm has changed):
114+
115+
derecho - OK
116+
117+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
118+
119+
derecho ----- OK
120+
izumi ------- OK
121+
122+
any other testing (give details below):
123+
124+
ctsm_sci
125+
derecho ---- OK
126+
127+
If the tag used for baseline comparisons was NOT the previous tag, note that here:
128+
129+
Answer changes
130+
--------------
131+
132+
Changes answers relative to baseline: Yes for compsets with eiher mizuRoute or CISM in them
133+
134+
Summarize any changes to answers, i.e.,
135+
- what code configurations: mizuRoute or CISM
136+
- what platforms/compilers: all
137+
- nature of change:
138+
CISM Update is for reproducible sums for CISM which should just be a roundoff level change
139+
For mizuRoute routing alogrithm changes will change answers beyond roundoff, but shouldn't change climate
140+
Defaults change also: timestep from daily to hourly
141+
headwaters drain at top of headwater not bottom
142+
qgwl_runoff_option to negative to match MOSART
143+
ice_runoff now True to match MOSART
144+
145+
Changes evaluated by the CISM team for CISM and Naoki Mizukami for mizuRoute
146+
147+
Other details
148+
-------------
149+
150+
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): mizuRoute and CISM
151+
mizuRoute to v3.1.1 (updates CESM coupling, small routing alogrithm changes, and then cleanup changes not affecting answers)
152+
CISM to cismwrap_2_2_015 (updates Derecho environment and then supports reproducable sums with roundoff differences)
153+
154+
Pull Requests that document the changes (include PR ids):
155+
(https://github.com/ESCOMP/ctsm/pull)
156+
#4088 -- Answer changes with updates for CISM and mizuRoute
157+
158+
===============================================================
159+
===============================================================
2160
Tag name: ctsm5.4.044
3161
Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
4162
Date: Mon Jun 8 03:09:27 PM MDT 2026

doc/ChangeSum

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Tag Who Date Summary
22
============================================================================================================================
3+
ctsm5.4.047 samrabin 07/10/2026 Merge b4b-dev to master
4+
ctsm5.4.046 glemieux 06/22/2026 Remove variables to exclude for fates_sp user mod
5+
ctsm5.4.045 erik 06/15/2026 Update mizuRoute and CISM submodules
36
ctsm5.4.044 erik 06/08/2026 Merge b4b-dev to master
47
ctsm5.4.043 slevis 06/03/2026 Overflow respiration bug fixes
58
ctsm5.4.042 slevis 05/22/2026 Get hillslope_fsat_equals_zero .true. for use_hillslope

src/fates

0 commit comments

Comments
 (0)