Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fxDONOTUSEurl = https://github.com/NGEET/fates
[submodule "cism"]
path = components/cism
url = https://github.com/ESCOMP/CISM-wrapper
fxtag = cismwrap_2_2_013
fxtag = cismwrap_2_2_015
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
Expand All @@ -60,7 +60,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
[submodule "mizuRoute"]
path = components/mizuRoute
url = https://github.com/ESCOMP/mizuRoute
fxtag = v3.0.1
fxtag = v3.1.1
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
Expand Down
11 changes: 2 additions & 9 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,6 @@
</phase>
</test>

<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_gnu.mizuroute-default">
<phase name="RUN">
<status>FAIL</status>
<issue>ESCOMP/mizuRoute#613</issue>
</phase>
</test>

<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_gnu.mizuroute-default">
<phase name="NLCOMP">
<status>FAIL</status>
Expand All @@ -200,9 +193,9 @@
</test>

<test name="SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default">
<phase name="MODEL_BUILD">
<phase name="RUN">
<status>FAIL</status>
<issue>ESCOMP/mizuRoute#615</issue>
<issue>ESCOMP/mizuRoute#636</issue>
</phase>
</test>

Expand Down
12 changes: 11 additions & 1 deletion cime_config/testdefs/testlist_clm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@
<machine name="izumi" compiler="nag" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="wallclock">00:40:00</option>
<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>
</options>
</test>
Expand Down Expand Up @@ -4411,6 +4411,16 @@
<option name="comment">Add to CESM testing because mizuRoute can be sensitive to submodule changes</option>
</options>
</test>
<test name="ERS_D_Ld10" grid="5x5_amazon_r05" compset="I2000Clm60SpMizGs" testmods="mizuroute-default">
<machines>
<machine name="izumi" compiler="nag" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Parallel test of mizuRoute for the tiny 5x5_amazon r05 grid</option>
<option name="comment">Add to CESM testing because mizuRoute can be sensitive to submodule changes</option>
</options>
</test>
<test name="ERI_Ld30" grid="nldas2_nldas2_rUSGS_mnldas2" compset="I2000Clm60SpMizGsNldas" testmods="mizuroute-default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
Expand Down
2 changes: 1 addition & 1 deletion components/mizuRoute
Submodule mizuRoute updated 67 files
+3 −3 .config_files.xml
+ docs/source/tech_note/images/overall_comp_workflow.png
+ docs/source/tech_note/images/uh_convolution.png
+1 −1 docs/source/tech_note/lake_routing.rst
+79 −6 docs/source/tech_note/reach_routing.rst
+1 −1 docs/source/users_guide/Build_model.rst
+114 −187 docs/source/users_guide/Control_file.rst
+28 −7 docs/source/users_guide/Hill.rst
+628 −185 docs/source/users_guide/Input_files.rst
+0 −31 docs/source/users_guide/Output_files.rst
+13 −108 docs/source/users_guide/Riv.rst
+ docs/source/users_guide/images/hw_drain_point.png
+1 −1 docs/source/users_guide/testCase.rst
+1 −1 route/build/Makefile
+0 −2 route/build/cpl/RtmFileUtils.F90
+163 −204 route/build/cpl/RtmMod.F90
+1 −13 route/build/cpl/RtmTimeManager.F90
+15 −93 route/build/cpl/RtmVar.F90
+84 −40 route/build/cpl/RunoffMod.F90
+26 −50 route/build/cpl/nuopc/rof_comp_nuopc.F90
+154 −138 route/build/cpl/nuopc/rof_import_export.F90
+6 −6 route/build/src/accum_runoff.f90
+19 −24 route/build/src/allocation.f90
+34 −54 route/build/src/ascii_utils.f90
+0 −2 route/build/src/dataTypes.f90
+15 −10 route/build/src/data_assimilation.f90
+2 −2 route/build/src/datetime_data.f90
+9 −5 route/build/src/dfw_route.f90
+7 −11 route/build/src/domain_decomposition.f90
+4 −4 route/build/src/gamma_func.f90
+1 −1 route/build/src/globalData.f90
+1 −1 route/build/src/historyFile.f90
+8 −6 route/build/src/hydraulic.f90
+12 −40 route/build/src/init_model_data.f90
+4 −11 route/build/src/irf_route.f90
+139 −153 route/build/src/kwe_route.f90
+10 −9 route/build/src/kwt_route.f90
+1 −3 route/build/src/lake_route.f90
+13 −3 route/build/src/main_route.f90
+111 −98 route/build/src/mc_route.f90
+170 −158 route/build/src/mpi_process.f90
+128 −0 route/build/src/mpi_utils.f90
+32 −2 route/build/src/ncio_utils.f90
+32 −71 route/build/src/network_topo.f90
+7 −5 route/build/src/nr_utils.f90
+4 −2 route/build/src/pfafstetter.f90
+7 −11 route/build/src/pio_utils.f90
+4 −4 route/build/src/popMetadat.f90
+2 −2 route/build/src/process_gage_meta.f90
+16 −75 route/build/src/process_ntopo.f90
+1 −9 route/build/src/process_param.f90
+19 −23 route/build/src/process_remap.f90
+42 −41 route/build/src/public_var.f90
+17 −9 route/build/src/read_control.f90
+64 −37 route/build/src/read_restart.f90
+28 −40 route/build/src/read_streamSeg.f90
+6 −3 route/build/src/standalone/get_basin_runoff.f90
+73 −53 route/build/src/standalone/model_setup.f90
+3 −2 route/build/src/standalone/read_remap.f90
+2 −2 route/build/src/standalone/read_runoff.f90
+5 −125 route/build/src/tracer.f90
+1 −2 route/build/src/water_balance.f90
+2 −5 route/build/src/write_restart_pio.f90
+20 −21 route/build/src/write_simoutput_pio.f90
+10 −35 route/build/src/write_streamSeg.f90
+9 −13 route/settings/SAMPLE-coupled.control
+9 −10 route/settings/SAMPLE.control
87 changes: 87 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,91 @@
===============================================================
Tag name: ctsm5.4.045
Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
Date: Mon Jun 15 11:35:27 AM MDT 2026
One-line Summary: Update mizuRoute and CISM submodules

Purpose and description of changes
----------------------------------

Update the submodules for CISM and also for mizuRoute

This changes answers for compsets with CISM and also for compsets that use mizuRoute. We currently don't test both of them together.

Bugs fixed
----------

List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:

Work on Get the mizu testlist working #3808
Was fixed ESCOMP/mizuRoute/Single-point mode incompatible with parallel I/O netcdf? Suggestion to change documentation. #613
Was fixed ESCOMP/mizuRoute/Document what we want covered in system tests #615
Fixes Going to a CISM active test for a processor change test (PEM), causes answers to change... #2542

Notes of particular relevance for users
---------------------------------------

Changes made to namelist defaults (e.g., changed parameter values):
Changes some mizuRoute defaults as shown below under answer changing section

Contributors: @nmizukami, @kate

Notes of particular relevance for developers:
---------------------------------------------

Changes to tests or testing:
Add a working test for izumi_nag

Testing summary: regular + ctsm_sci
----------------
[PASS means all tests PASS; OK means tests PASS other than expected fails.]

build-namelist tests (if CLMBuildNamelist.pm has changed):

derecho - OK

regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):

derecho ----- OK
izumi ------- OK

any other testing (give details below):

ctsm_sci
derecho ---- OK

If the tag used for baseline comparisons was NOT the previous tag, note that here:

Answer changes
--------------

Changes answers relative to baseline: Yes for compsets with eiher mizuRoute or CISM in them

Summarize any changes to answers, i.e.,
- what code configurations: mizuRoute or CISM
- what platforms/compilers: all
- nature of change:
CISM Update is for reproducible sums for CISM which should just be a roundoff level change
For mizuRoute routing alogrithm changes will change answers beyond roundoff, but shouldn't change climate
Defaults change also: timestep from daily to hourly
headwaters drain at top of headwater not bottom
qgwl_runoff_option to negative to match MOSART
ice_runoff now True to match MOSART

Changes evaluated by the CISM team for CISM and Naoki Mizukami for mizuRoute

Other details
-------------

List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): mizuRoute and CISM
mizuRoute to v3.1.1 (updates CESM coupling, small routing alogrithm changes, and then cleanup changes not affecting answers)
CISM to cismwrap_2_2_015 (updates Derecho environment and then supports reproducable sums with roundoff differences)

Pull Requests that document the changes (include PR ids):
(https://github.com/ESCOMP/ctsm/pull)
#4088 -- Answer changes with updates for CISM and mizuRoute

===============================================================
===============================================================
Tag name: ctsm5.4.044
Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
Date: Mon Jun 8 03:09:27 PM MDT 2026
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeSum
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.4.045 erik 06/15/2026 Update mizuRoute and CISM submodules
ctsm5.4.044 erik 06/08/2026 Merge b4b-dev to master
ctsm5.4.043 slevis 06/03/2026 Overflow respiration bug fixes
ctsm5.4.042 slevis 05/22/2026 Get hillslope_fsat_equals_zero .true. for use_hillslope
Expand Down
Loading