From bbd082431155b2edbf861635e0c22791d77cf9f4 Mon Sep 17 00:00:00 2001 From: r-ward Date: Thu, 11 Jun 2026 16:19:11 -0700 Subject: [PATCH 1/5] Fix typo, 'expotential' --> 'exponential' in fates c starvation model namelist settings --- src/utils/clmfates_interfaceMod.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90 index ae2a409f7c..dc33169a97 100644 --- a/src/utils/clmfates_interfaceMod.F90 +++ b/src/utils/clmfates_interfaceMod.F90 @@ -588,7 +588,7 @@ subroutine CLMFatesGlobals2() if (trim(fates_cstarvation_model) == 'linear') then pass_cstarvation_model = 1 - else if (trim(fates_cstarvation_model) == 'expontential') then + else if (trim(fates_cstarvation_model) == 'exponential') then pass_cstarvation_model = 2 end if call set_fates_ctrlparms('mort_cstarvation_model',ival=pass_cstarvation_model) From a7811e02ad127a44ee76a6e28a8fdaf1a1efd4f8 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 2 Jul 2026 12:07:59 -0700 Subject: [PATCH 2/5] add non-default carbon starvation testing to fates suite --- cime_config/testdefs/testlist_clm.xml | 10 ++++++++++ .../testmods_dirs/clm/FatesColdCStarvationExp/README | 1 + .../clm/FatesColdCStarvationExp/include_user_mods | 1 + .../clm/FatesColdCStarvationExp/user_nl_clm | 1 + 4 files changed, 13 insertions(+) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/README create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/include_user_mods create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/user_nl_clm diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 3fc8b52928..0b66118ff1 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3890,6 +3890,16 @@ + + + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/README b/cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/README new file mode 100644 index 0000000000..d3c811248e --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/README @@ -0,0 +1 @@ +This tests the non-default option for the FATES carbon starvation option diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/include_user_mods new file mode 100644 index 0000000000..14f7591b72 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/include_user_mods @@ -0,0 +1 @@ +../FatesCold diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/user_nl_clm new file mode 100644 index 0000000000..d474a533bd --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdCStarvationExp/user_nl_clm @@ -0,0 +1 @@ +fates_cstarvation_model = 'exponential' From 6d8097156264634702ec02220b85f12835dfafd2 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 3 Aug 2026 15:09:30 -0600 Subject: [PATCH 3/5] Change the new izumi_nag test to ERP_D (debug) so it will build in nag --- cime_config/testdefs/testlist_clm.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 48f3c88f1d..6312e30e72 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3893,13 +3893,21 @@ - + + + + + + + + + From 694d00b905b5772dce848ec93d7b94592d789445 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 3 Aug 2026 15:39:37 -0600 Subject: [PATCH 4/5] Update ChangeLog/ChangeSum --- doc/ChangeLog | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 52 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index e0cc8eba4a..0f4fce47d3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,55 @@ =============================================================== +Tag name: ctsm5.4.049 +Originator(s): r-ward (Rachel Ward) +Date: Mon Aug 3 15:24:15 MDT 2026 +One-line Summary: Fix typo 'expontential' to 'exponential' in fates c starvation model + +Purpose and description of changes +---------------------------------- + + Fixes a typo in src/utils/clmfates_interfaceMod.F90 for the fates c starvation namelist option ("expontential" --> "exponential") that causes runs using fates_cstarvation_model=exponential (valid options =linear, exponential) to abort at init with error message "Invalid carbon starvation model". + +Notes of particular relevance for users +--------------------------------------- +Changes made to namelist defaults (e.g., changed parameter values): + Typo correction to the fates c starvation namelist option "exponential" + +Contributors: + glemieux + +Notes of particular relevance for developers: +--------------------------------------------- +Changes to tests or testing: + Adding a derecho test and an izumi test to the fates test-suite: + ERP_Ld90.f45_f45_mg37.I2000Clm60FatesRs.derecho_intel.clm-FatesColdCStarvationExp + ERP_D_Ld90.f45_f45_mg37.I2000Clm60FatesRs.izumi_nag.clm-FatesColdCStarvationExP + +Testing summary: +---------------- + + [PASS means all tests PASS; OK means tests PASS other than expected fails.] + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- OK + izumi ------- OK + + fates tests: new baseline fates-sci.1.92.7_api.46.0.0-ctsm5.4.049 compared to existing baseline fates-sci.1.92.7_api.46.0.0-ctsm5.4.047 + derecho ----- OK + izumi ------- OK + +Answer changes +-------------- + +Changes answers relative to baseline: No + +Other details +------------- +Pull Requests that document the changes (include PR ids): + https://github.com/ESCOMP/ctsm/pull/4093 + +=============================================================== +=============================================================== Tag name: ctsm5.4.048 Originator(s): erik (Erik Kluzek) Date: Fri Jul 31 02:44:53 PM MDT 2026 diff --git a/doc/ChangeSum b/doc/ChangeSum index 806e2a42dc..256335be25 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.4.049 r-ward 08/03/2026 Fix typo 'expontential' to 'exponential' in fates c starvation model ctsm5.4.048 erik 07/31/2026 Move b4b-dev to master ctsm5.4.047 samrabin 07/10/2026 Merge b4b-dev to master ctsm5.4.046 glemieux 06/22/2026 Remove variables to exclude for fates_sp user mod From 5a0e53dffcea7b83dfc5f18ac73322a924b19c1c Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 3 Aug 2026 16:25:22 -0600 Subject: [PATCH 5/5] Add email and affiliation to ChangeLog entry --- doc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 0f4fce47d3..57d1414ef7 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,6 +1,6 @@ =============================================================== Tag name: ctsm5.4.049 -Originator(s): r-ward (Rachel Ward) +Originator(s): r-ward (Rachel Ward, r.ward@berkeley.edu, UC Berkeley) Date: Mon Aug 3 15:24:15 MDT 2026 One-line Summary: Fix typo 'expontential' to 'exponential' in fates c starvation model