From f2bd0cd4f0db69954710f3fa71564386326625eb Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 19 Aug 2025 16:50:09 -0600 Subject: [PATCH 1/8] Update .gitmodules to ccs_config_cesm1.0.56, cime6.1.113, cmeps1.1.5 --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7798b4b9a2..cc1a067964 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git -fxtag = ccs_config_cesm1.0.48 +fxtag = ccs_config_cesm1.0.56 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git @@ -76,7 +76,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git [submodule "cime"] path = cime url = https://github.com/ESMCI/cime -fxtag = cime6.1.107 +fxtag = cime6.1.113 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESMCI/cime @@ -84,7 +84,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git -fxtag = cmeps1.1.2 +fxtag = cmeps1.1.5 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git From 760cdd4eef996c0cd7d6e55f4ac45702a99d2fe5 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 19 Aug 2025 16:52:05 -0600 Subject: [PATCH 2/8] Update to the new submodules that .gitmodules points to --- ccs_config | 2 +- cime | 2 +- components/cmeps | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ccs_config b/ccs_config index 4b5e4eb54d..e2540807a5 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 4b5e4eb54d6a0ec7de59065b897d2de2524e0ecf +Subproject commit e2540807a54a45278901574df08ddc8c7f61d1d8 diff --git a/cime b/cime index 6f184bf93c..1616f81668 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 6f184bf93ca6ae4ead11d77dc38639c6cd97149f +Subproject commit 1616f81668cd061597487338980ab2608b5c9034 diff --git a/components/cmeps b/components/cmeps index bd3ff83126..aeb81084f3 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit bd3ff83126516a16263fc7c4c16bbdeb4bd753b3 +Subproject commit aeb81084f338b06b4b9ad94dbb9ee39208f2d74d From 87987c48604c6796dd59a1526ef8ed1168206682 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 22 Aug 2025 14:00:52 -0600 Subject: [PATCH 3/8] Revert to ccs_config_cesm1.0.51 (from .56) to preserve b4b --- .gitmodules | 2 +- ccs_config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index cc1a067964..69137da1c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git -fxtag = ccs_config_cesm1.0.56 +fxtag = ccs_config_cesm1.0.51 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git diff --git a/ccs_config b/ccs_config index e2540807a5..a4abe40e95 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit e2540807a54a45278901574df08ddc8c7f61d1d8 +Subproject commit a4abe40e9523c74be01cdf5fb0ee6046fefc7c67 From f66f711f56684bb2a56064ef1ba722e2b12582f9 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 25 Aug 2025 12:59:58 -0600 Subject: [PATCH 4/8] Update ccs_config to be consistent with .gitmodules --- ccs_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccs_config b/ccs_config index a4abe40e95..e2540807a5 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit a4abe40e9523c74be01cdf5fb0ee6046fefc7c67 +Subproject commit e2540807a54a45278901574df08ddc8c7f61d1d8 From 45d9910ffa05c373ac096b82d3d1d03e4f6234cf Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 26 Aug 2025 15:29:06 -0600 Subject: [PATCH 5/8] Draft ChangeLog/Sum --- doc/ChangeLog | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 68 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 69dc644440..8dd216111c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,71 @@ =============================================================== +Tag name: ctsm5.3.073 +Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310) +Date: Tue 26 Aug 2025 03:20:16 PM MDT +One-line Summary: Update .gitmodules to cesm3_0_alpha07c + +Purpose and description of changes +---------------------------------- + Update ccs_config_cesm1.0.48 to ccs_config_cesm1.0.56. + Update cime6.1.112 to cime6.1.113. + Changes answers in gnu and nvhpc tests on derecho. + +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]: + Resolves #3411 + +Testing summary: +---------------- + + [PASS means all tests PASS; OK means tests PASS other than expected fails.] + + build-namelist tests (if CLMBuildNamelist.pm has changed): + + derecho - + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- + izumi ------- + +Answer changes +-------------- + +Changes answers relative to baseline: Yes + + Summarize any changes to answers, i.e., + - what platforms/compilers: gnu and nvhpc on derecho + - nature of change: roundoff + +Other details +------------- +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): + ccs_config_cesm1.0.48 --> ccs_config_cesm1.0.56. + cime6.1.112 --> cime6.1.113. + +Pull Requests that document the changes (include PR ids): + https://github.com/ESCOMP/ctsm/pull/3422 + +=============================================================== +=============================================================== Tag name: ctsm5.3.072 Originator(s): jinmuluo (Jinmu Luo, Cornell University) Date: Tue 26 Aug 2025 02:53:26 PM MDT diff --git a/doc/ChangeSum b/doc/ChangeSum index b8340937d7..d2db0724d3 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.3.073 slevis 08/2x/2025 Update .gitmodules to cesm3_0_alpha07c ctsm5.3.072 jinmuluo 08/26/2025 New vertical movement scheme for soil nitrate ctsm5.3.071 samrabin 08/22/2025 Merge b4b-dev to master ctsm5.3.070 glemieux 08/22/2025 Update default FATES parameter file and add FATES managed fire namelist option From d9ea2bfd159ec7d1540e0ebdae2e06eff35ce00d Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 26 Aug 2025 17:43:41 -0600 Subject: [PATCH 6/8] Updated ChangeLog/Sum --- doc/ChangeLog | 18 +++++++++++------- doc/ChangeSum | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 8dd216111c..70db73ae8f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,14 +1,14 @@ =============================================================== Tag name: ctsm5.3.073 Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310) -Date: Tue 26 Aug 2025 03:20:16 PM MDT +Date: Tue 26 Aug 2025 05:42:28 PM MDT One-line Summary: Update .gitmodules to cesm3_0_alpha07c Purpose and description of changes ---------------------------------- Update ccs_config_cesm1.0.48 to ccs_config_cesm1.0.56. Update cime6.1.112 to cime6.1.113. - Changes answers in gnu and nvhpc tests on derecho. + Changes answers in gnu and nvhpc tests on derecho (details below). Significant changes to scientifically-supported configurations -------------------------------------------------------------- @@ -39,12 +39,12 @@ Testing summary: build-namelist tests (if CLMBuildNamelist.pm has changed): - derecho - + derecho - PASS regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): - derecho ----- - izumi ------- + derecho ----- OK + izumi ------- OK Answer changes -------------- @@ -55,11 +55,15 @@ Changes answers relative to baseline: Yes - what platforms/compilers: gnu and nvhpc on derecho - nature of change: roundoff + Answers change due to the following: + ccs_config1.0.49 -- Moves the NVHPC compiler version back a bit on Derecho, which changes answers + ccs_config1.0.52 -- Updates the GNU compiler version on Derecho, which changes answers + Other details ------------- List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): - ccs_config_cesm1.0.48 --> ccs_config_cesm1.0.56. - cime6.1.112 --> cime6.1.113. + ccs_config_cesm1.0.48 --> ccs_config_cesm1.0.56 + cime6.1.112 --> cime6.1.113 Pull Requests that document the changes (include PR ids): https://github.com/ESCOMP/ctsm/pull/3422 diff --git a/doc/ChangeSum b/doc/ChangeSum index d2db0724d3..f87d388842 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.3.073 slevis 08/2x/2025 Update .gitmodules to cesm3_0_alpha07c + ctsm5.3.073 slevis 08/27/2025 Update .gitmodules to cesm3_0_alpha07c ctsm5.3.072 jinmuluo 08/26/2025 New vertical movement scheme for soil nitrate ctsm5.3.071 samrabin 08/22/2025 Merge b4b-dev to master ctsm5.3.070 glemieux 08/22/2025 Update default FATES parameter file and add FATES managed fire namelist option From ba764511bc96d663b66cbd7a48f78d853bc05430 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 28 Aug 2025 13:09:34 -0600 Subject: [PATCH 7/8] Update ExpectedTestFails.xml as agreed in this PR --- cime_config/testdefs/ExpectedTestFails.xml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index c54ee94c89..47dd00c658 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -98,6 +98,24 @@ + + + FAIL + #3453 + + + + + FAIL + #3454 + + + + + FAIL + #3454 + + FAIL @@ -164,9 +182,9 @@ - + FAIL - #1733 and #3180 + #1733 From 7e833a4dab16cedae9600f04fa1b289cefe21e5e Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 28 Aug 2025 13:18:14 -0600 Subject: [PATCH 8/8] Final ChangeLog/Sum --- doc/ChangeLog | 10 +++++++--- doc/ChangeSum | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 70db73ae8f..c41de96e12 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,14 +1,17 @@ =============================================================== Tag name: ctsm5.3.073 Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310) -Date: Tue 26 Aug 2025 05:42:28 PM MDT +Date: Thu 28 Aug 2025 01:10:16 PM MDT One-line Summary: Update .gitmodules to cesm3_0_alpha07c Purpose and description of changes ---------------------------------- Update ccs_config_cesm1.0.48 to ccs_config_cesm1.0.56. Update cime6.1.112 to cime6.1.113. - Changes answers in gnu and nvhpc tests on derecho (details below). + Answers change in gnu and nvhpc tests on derecho (details below). + New bugs found and reported in issues + #3453 FAIL MKSURFDATAESMF_...intel NLCOMP + #3454 FAIL SUBSETDATA* tests NLCOMP Significant changes to scientifically-supported configurations -------------------------------------------------------------- @@ -30,7 +33,8 @@ Does this tag change answers significantly for any of the following physics conf Bugs fixed ---------- List of CTSM issues fixed (include CTSM Issue # and description) [one per line]: - Resolves #3411 + Resolves #3411 Update cime and ccs_config versions to those used in cesm3_0_alpha07c + Resolves #3180 nvhpc module setup problem in ctsm5.3.050 with ccs_config1.0.43 Testing summary: ---------------- diff --git a/doc/ChangeSum b/doc/ChangeSum index f87d388842..832bf08ad4 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.3.073 slevis 08/27/2025 Update .gitmodules to cesm3_0_alpha07c + ctsm5.3.073 slevis 08/28/2025 Update .gitmodules to cesm3_0_alpha07c ctsm5.3.072 jinmuluo 08/26/2025 New vertical movement scheme for soil nitrate ctsm5.3.071 samrabin 08/22/2025 Merge b4b-dev to master ctsm5.3.070 glemieux 08/22/2025 Update default FATES parameter file and add FATES managed fire namelist option