From 034ef08d35b6fbeade21f0e4f4b494021fb7b452 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 9 Jun 2026 23:55:30 -0600 Subject: [PATCH 1/5] Update mizuRoute and CISM, changes answers for compsets that use them --- .gitmodules | 4 ++-- components/cism | 2 +- components/mizuRoute | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index b5156d3190..94d466f094 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 @@ -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 diff --git a/components/cism b/components/cism index 977367bdef..7d555877c3 160000 --- a/components/cism +++ b/components/cism @@ -1 +1 @@ -Subproject commit 977367bdef637731ca4fe4dd0ca66ad6b6642b4f +Subproject commit 7d555877c3dbb9def01e67b610c16e04fc229145 diff --git a/components/mizuRoute b/components/mizuRoute index f4c3482f2b..28514dea3f 160000 --- a/components/mizuRoute +++ b/components/mizuRoute @@ -1 +1 @@ -Subproject commit f4c3482f2b29b17ff66c00b615b3305c616fc85a +Subproject commit 28514dea3fd28a2f820c7ecaa9014f820c1bb220 From bb2f060c3bafd7d63137a8fde989a320ff9a6693 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 10 Jun 2026 11:33:51 -0600 Subject: [PATCH 2/5] Increase wallclock as I had it die on Izumi a couple of time due to insufficient wallclock --- cime_config/testdefs/testlist_clm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 90f6ca000b..032c9e5403 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -862,7 +862,7 @@ - + From cf49d676f9a15863767b1d5e29e5de6cffce67f8 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 10 Jun 2026 19:49:42 -0600 Subject: [PATCH 3/5] Remove mizuroute test that passes now, and upgrade the izumi_nag test that now fails at runtime --- cime_config/testdefs/ExpectedTestFails.xml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index c0eb8acf4e..746f56abed 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -178,13 +178,6 @@ - - - FAIL - ESCOMP/mizuRoute#613 - - - FAIL @@ -200,9 +193,9 @@ - + FAIL - ESCOMP/mizuRoute#615 + ESCOMP/mizuRoute#636 From 318a4dcb936e7467126ca63bf0b057be01db55ec Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 11 Jun 2026 01:27:33 -0600 Subject: [PATCH 4/5] Add a simple r05 test for izumi_nag that will run to show tests will run with mizuRoute --- cime_config/testdefs/testlist_clm.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 032c9e5403..3fc8b52928 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -4411,6 +4411,16 @@ + + + + + + + + + + From 2903c9445ed6442cf269a419aab36af803fe4caa Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 15 Jun 2026 13:18:50 -0600 Subject: [PATCH 5/5] Update change files --- doc/ChangeLog | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 88 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index d1824191e2..3ec90f4b3b 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -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 diff --git a/doc/ChangeSum b/doc/ChangeSum index 1aeac2a762..1b468fa5c1 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -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