From 90f5264f23e0541fbeccc6f6347cbbae3c69d64c Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 14 Feb 2025 11:39:11 -0800 Subject: [PATCH 1/6] update default fates parameter file --- bld/namelist_files/namelist_defaults_ctsm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 64e00527fe..9c643f6dd1 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -532,7 +532,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). -lnd/clm2/paramdata/fates_params_api.36.1.0_14pft_c241003.nc +lnd/clm2/paramdata/fates_params_api.37.1.0_14pft_c250214.nc From b731c384331c0fd4012f8c77c6d3535ea2795259 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 14 Feb 2025 11:40:47 -0800 Subject: [PATCH 2/6] update fates tag in gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 0771c90237..f8bb22ffd1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ [submodule "fates"] path = src/fates url = https://github.com/NGEET/fates -fxtag = sci.1.80.11_api.37.0.0 +fxtag = sci.1.81.0_api.37.1.0 fxrequired = AlwaysRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/NCAR/fates-release From 326eb88e6d3a0015677977c74d7814f1218e452f Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 18 Feb 2025 14:14:57 -0800 Subject: [PATCH 3/6] update changelog for ctsm5.3.025 --- doc/ChangeLog | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 86 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index be97229017..90cd734b1a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,89 @@ =============================================================== +Tag name: ctsm5.3.025 +Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov) +Date: Tue Feb 18 02:02:34 PM PST 2025 +One-line Summary: FATES default parameter file update + +Purpose and description of changes +---------------------------------- + +This tag updates the default parameter file for FATES bringing in a number of updates: + - adds parameters for land use grazing + - updates the FATES z0mr turbulence parameters for consistency with CLM + - adds FATES pft-dependent btran model switches for a forthcoming update + - updates the default hydro solver switch to Picard 2D + +This also updates the default FATES tag which includes two issue fixes and introduces +the aforementioned land use grazing capability. + +Significant changes to scientifically-supported configurations +-------------------------------------------------------------- + +Does this tag change answers significantly for any of the following physics configurations? +(Details of any changes will be given in the "Answer changes" section below.) + + [Put an [X] in the box for any configuration with significant answer changes.] + +[ ] clm6_0 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + +Bugs fixed +---------- +List of CTSM issues fixed (include CTSM Issue # and description) [one per line]: + Fixes FATES#1316 -- z0mr parameters are all the same in the default parameter file + Fixes FATES#773 -- update the default hydraulics solver? + +Notes of particular relevance for users +--------------------------------------- +Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): + The FATES tag update includes new history outputs associated with land use grazing. + +Changes made to namelist defaults (e.g., changed parameter values): + The fates default parameter file has been updated. See the associated FATES pull + requests for more detail. + + +Testing summary: +---------------- + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- + izumi ------- + + fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) + derecho ----- OK + izumi ------- + +Answer changes +-------------- + +Changes answers relative to baseline: Yes, for FATES tests only + + Summarize any changes to answers, i.e., + - what code configurations: + - what platforms/compilers: + - nature of change (roundoff; larger than roundoff/same climate; new climate): + + +Other details +------------- +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): + fates: sci.1.80.11_api.37.0.0 -> sci.1.81.0_api.37.1.0 + +Pull Requests that document the changes (include PR ids): +(https://github.com/ESCOMP/ctsm/pull) + https://github.com/ESCOMP/CTSM/pull/2965 + https://github.com/NGEET/fates/pull/1334 + +=============================================================== +=============================================================== Tag name: ctsm5.3.024 Originator(s): xinchang (Cathy Xinchang Li, U of Illinois - Urbana-Champaign) Date: Tue Feb 11 09:56:24 MST 2025 diff --git a/doc/ChangeSum b/doc/ChangeSum index dbe642f55c..4bfc0ce86a 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.3.025 glemieux 02/18/2025 FATES default parameter file update ctsm5.3.024 xinchang 02/11/2025 Change choice of pressure in CLMU building energy model ctsm5.3.023 afoster 02/08/2025 merge b4b-dev ctsm5.3.022 glemieux 02/06/2025 Update FATES namelist build to avoid Meier2022 From 8aafff29f7f9005b79e9a7158684d3483dfdcf4d Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 18 Feb 2025 14:54:34 -0800 Subject: [PATCH 4/6] update izumi fates test results --- doc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 90cd734b1a..b544c1e004 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -59,7 +59,7 @@ Testing summary: fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) derecho ----- OK - izumi ------- + izumi ------- OK Answer changes -------------- From 58706ff478c294411c41099de90645b9dfce3dc2 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 18 Feb 2025 14:55:53 -0800 Subject: [PATCH 5/6] update fates submodule commit hash --- src/fates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fates b/src/fates index 48b3085f65..ccc1de04ab 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit 48b3085f65bd00f7ee1eb2c134a6af188a639dbc +Subproject commit ccc1de04abcc14dcc8a24bb06f271bc04e2bc48c From 24e4d76b5f63df41c2c3d9e62d81d85774f49db7 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 20 Feb 2025 14:25:03 -0700 Subject: [PATCH 6/6] Update date in Change files --- doc/ChangeLog | 2 +- doc/ChangeSum | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index b544c1e004..2e7e95f9b8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: ctsm5.3.025 Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov) -Date: Tue Feb 18 02:02:34 PM PST 2025 +Date: Thu Feb 20 14:24:45 MST 2025 One-line Summary: FATES default parameter file update Purpose and description of changes diff --git a/doc/ChangeSum b/doc/ChangeSum index 4bfc0ce86a..44d19c635e 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.3.025 glemieux 02/18/2025 FATES default parameter file update + ctsm5.3.025 glemieux 02/20/2025 FATES default parameter file update ctsm5.3.024 xinchang 02/11/2025 Change choice of pressure in CLMU building energy model ctsm5.3.023 afoster 02/08/2025 merge b4b-dev ctsm5.3.022 glemieux 02/06/2025 Update FATES namelist build to avoid Meier2022