From f147be3a4c3306ccb177ddb8ade0fa7b065f2b3f Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 15 Nov 2024 10:45:53 -0700 Subject: [PATCH 1/8] Revert "fix typo in fates hydro user_nl_clm" This reverts commit 97d1657754c75fedd6482d4d71b773859029be5d. --- .../testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm index 318a34dfec..15dcf6de1a 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm @@ -2,7 +2,7 @@ hist_mfilt = 365 hist_nhtfrq = -24 hist_empty_htapes = .true. use_fates_planthydro= .true. -fates_paramfile = '$CASEROOT/fates_params_hydrograsstempfix.nc' +fates_paramfile = '$CASEROOT/fates_params_hydrograsstempfix.n' hist_fincl1 = 'FATES_ERRH2O_SZPF', 'FATES_TRAN_SZPF', 'FATES_SAPFLOW_SZPF', 'FATES_ITERH1_SZPF','FATES_ABSROOT_H2O_SZPF', 'FATES_TRANSROOT_H2O_SZPF','FATES_STEM_H2O_SZPF','FATES_LEAF_H2O_SZPF', From ea475c135f13f3ca7e35e7f1650e1a345f3d2c6b Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 15 Nov 2024 10:46:16 -0700 Subject: [PATCH 2/8] Revert "add shell call to generate fates hydro parameter file on the fly" This reverts commit f2f75351febd4a413b0788dae256443fe5734510. --- .../testmods_dirs/clm/FatesColdHydro/shell_commands | 8 -------- .../testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm | 1 - 2 files changed, 9 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/shell_commands deleted file mode 100644 index e629e7ca34..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/shell_commands +++ /dev/null @@ -1,8 +0,0 @@ -SRCDIR=`./xmlquery SRCROOT --value` -CASEDIR=`./xmlquery CASEROOT --value` -FATESDIR=$SRCDIR/src/fates -FATESPARAMFILE=$CASEDIR/fates_params_hydrograsstempfix.nc - -ncgen -o $FATESPARAMFILE $FATESDIR/parameter_files/fates_params_default.cdl - -$FATESDIR/tools/modify_fates_paramfile.py --O --fin $FATESPARAMFILE --fout $FATESPARAMFILE --var fates_allom_smode --val 1 --allpfts diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm index 15dcf6de1a..f0bdb388eb 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm @@ -2,7 +2,6 @@ hist_mfilt = 365 hist_nhtfrq = -24 hist_empty_htapes = .true. use_fates_planthydro= .true. -fates_paramfile = '$CASEROOT/fates_params_hydrograsstempfix.n' hist_fincl1 = 'FATES_ERRH2O_SZPF', 'FATES_TRAN_SZPF', 'FATES_SAPFLOW_SZPF', 'FATES_ITERH1_SZPF','FATES_ABSROOT_H2O_SZPF', 'FATES_TRANSROOT_H2O_SZPF','FATES_STEM_H2O_SZPF','FATES_LEAF_H2O_SZPF', From ac5a615cea45ecc3af1c2c29705a00f873a782e2 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Mon, 18 Nov 2024 10:42:42 -0800 Subject: [PATCH 3/8] update fates tag to sci.1.80.1_api.37.0.0 This tag includes the fix to NGEET/fates#1254 and will allow the current default fates parameter file to be used in fates hydro tests --- .gitmodules | 2 +- src/fates | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 225f2f75ac..7429d412bc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ [submodule "fates"] path = src/fates url = https://github.com/NGEET/fates -fxtag = sci.1.79.3_api.37.0.0 +fxtag = sci.1.80.1_api.37.0.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 diff --git a/src/fates b/src/fates index e3e7d2cd86..08f2410fd2 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit e3e7d2cd86a66f8ca0e8f6dc4a823246a2bdb95b +Subproject commit 08f2410fd2a9e04920eedb4cc2d51a09f68127ec From 74131679607b1ab873ba9c0d96773e69d386a2d5 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 13 Dec 2024 10:39:59 -0800 Subject: [PATCH 4/8] update fates tag to sci.1.80.4_api.37.0.0 --- .gitmodules | 2 +- src/fates | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7429d412bc..d743e6db81 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ [submodule "fates"] path = src/fates url = https://github.com/NGEET/fates -fxtag = sci.1.80.1_api.37.0.0 +fxtag = sci.1.80.4_api.37.0.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 diff --git a/src/fates b/src/fates index 08f2410fd2..296e1d6a45 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit 08f2410fd2a9e04920eedb4cc2d51a09f68127ec +Subproject commit 296e1d6a45f05a800073d376286d0537d2290e96 From 6603ed2ac813b0a5151df7d1aeb16f570f1764c3 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 2 Jan 2025 14:42:42 -0800 Subject: [PATCH 5/8] add PVT test issue #2919 to expected failures --- cime_config/testdefs/ExpectedTestFails.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index ea25c74f64..e88cb36954 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -556,6 +556,13 @@ + + + FAIL + #2919 + + + From c67acd5eca6d88dadbc351d13feb2298418d4407 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 7 Jan 2025 10:33:52 -0800 Subject: [PATCH 6/8] update changelog --- doc/ChangeLog | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 76 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index ed6892a285..e9d3b799e1 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,79 @@ =============================================================== +Tag name: ctsm5.3.018 +Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov) +Date: Tue Jan 7 10:22:51 MST 2025 +One-line Summary: FATES hydro test update + +Purpose and description of changes +---------------------------------- + +This minor update reverts a temporary work around for FATES hydro system tests. +The FATES tag is updated to capture the FATES-side fix to the issue that predicated +the temporary testing workaround. + +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]: + + #2878 - Remove fates_allom_smode shell_command update in FatesColdHydro testmod + +Notes of particular relevance for developers: +--------------------------------------------- +Changes to tests or testing: + FATES hydro tests will no long build a custom parameter file on the fly + The one FATES PVT test has been added to expected failure per #2919 + +Testing summary: regular + fates +---------------- + [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 (see #2924) + + fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) + derecho ----- OK + izumi ------- OK + + +Answer changes +-------------- + +Changes answers relative to baseline: Yes, but only for aux_clm fates testmods + + The FATES tag update includes a number of science and bug fix updates since the + last fates tag update, which results in non-B4B changes. These have been reviewed + and differ as expected. + +Other details +------------- +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): + fates: sci.1.79.3_api.37.0.0 -> sci.1.80.4_api.37.0.0 + +Pull Requests that document the changes (include PR ids): +(https://github.com/ESCOMP/ctsm/pull) + https://github.com/ESCOMP/CTSM/pull/2882 + +=============================================================== +=============================================================== Tag name: ctsm5.3.017 Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310) Date: Tue 24 Dec 2024 03:43:01 PM MST diff --git a/doc/ChangeSum b/doc/ChangeSum index 60d46392ff..8784bbd5ea 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.3.018 glemieux 01/07/2025 FATES hydro test update ctsm5.3.017 slevis 12/24/2024 Merge b4b-dev ctsm5.3.016 erik 12/19/2024 Rpointer files for restart now have the simulation date in the filename ctsm5.3.015 erik 12/18/2024 Update cdeps with cam7 nextsw cday changes From 136970d9fe4e1ce3dcfc3733d91174914685dcc7 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 7 Jan 2025 16:24:37 -0700 Subject: [PATCH 7/8] Update change files to point to the tags of the two tmp branch tags that were made --- doc/ChangeLog | 6 +++--- doc/ChangeSum | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index e9d3b799e1..c6eb6974db 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== -Tag name: ctsm5.3.018 +Tag name: tmp-241219.n02.ctsm5.3.016 Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov) -Date: Tue Jan 7 10:22:51 MST 2025 +Date: Tue 07 Jan 2025 04:23:28 PM MST One-line Summary: FATES hydro test update Purpose and description of changes @@ -74,7 +74,7 @@ Pull Requests that document the changes (include PR ids): =============================================================== =============================================================== -Tag name: ctsm5.3.017 +Tag name: tmp-241219.n01.ctsm5.3.016 Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310) Date: Tue 24 Dec 2024 03:43:01 PM MST One-line Summary: Merge b4b-dev diff --git a/doc/ChangeSum b/doc/ChangeSum index 8784bbd5ea..f3fdf4e96d 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,7 +1,7 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.3.018 glemieux 01/07/2025 FATES hydro test update - ctsm5.3.017 slevis 12/24/2024 Merge b4b-dev +tmp-241219.n02.ctsm5.3.016 01/07/2025 FATES hydro test update +tmp-241219.n01.ctsm5.3.016 12/24/2024 Merge b4b-dev ctsm5.3.016 erik 12/19/2024 Rpointer files for restart now have the simulation date in the filename ctsm5.3.015 erik 12/18/2024 Update cdeps with cam7 nextsw cday changes ctsm5.3.014 erik 12/03/2024 Bring in several fixes for testing in the previous cesm3_0_beta03/04 tags From e58aab50a4a586c0ce14bf78d385ab36466ab124 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 8 Jan 2025 10:53:47 -0700 Subject: [PATCH 8/8] Update timestamp 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 c6eb6974db..8e2b20acc1 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: tmp-241219.n02.ctsm5.3.016 Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov) -Date: Tue 07 Jan 2025 04:23:28 PM MST +Date: Wed 08 Jan 2025 10:52:49 AM MST One-line Summary: FATES hydro test update Purpose and description of changes diff --git a/doc/ChangeSum b/doc/ChangeSum index f3fdf4e96d..2c0706055b 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ -tmp-241219.n02.ctsm5.3.016 01/07/2025 FATES hydro test update +tmp-241219.n02.ctsm5.3.016 01/08/2025 FATES hydro test update tmp-241219.n01.ctsm5.3.016 12/24/2024 Merge b4b-dev ctsm5.3.016 erik 12/19/2024 Rpointer files for restart now have the simulation date in the filename ctsm5.3.015 erik 12/18/2024 Update cdeps with cam7 nextsw cday changes