From 045e4d32786e56c62fa303decdccb1f6fc1b46ab Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Thu, 30 Jan 2025 09:38:27 -0500 Subject: [PATCH 01/17] update grid masks for cam7 tests --- cime_config/testdefs/testlist_cam.xml | 24 +++++------ doc/ChangeLog | 60 +++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 12 deletions(-) diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index d0789ac1f3..8b6dd22501 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -134,7 +134,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -1886,7 +1886,7 @@ - + @@ -1895,7 +1895,7 @@ - + @@ -1904,7 +1904,7 @@ - + @@ -1913,7 +1913,7 @@ - + @@ -1922,7 +1922,7 @@ - + @@ -2376,7 +2376,7 @@ - + @@ -2386,7 +2386,7 @@ - + @@ -2395,7 +2395,7 @@ - + @@ -2404,7 +2404,7 @@ - + diff --git a/doc/ChangeLog b/doc/ChangeLog index d9a7a43b73..664b1112df 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,65 @@ =============================================================== +Tag name: +Originator(s): +Date: +One-line Summary: updates to grid masks +Github PR URL: + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + +Resolves #1236 - Change our testing from using the POP land/ocean mask to + the MOM t232 land/ocean mask +- The cam7 tests using the ne30pg3_ne30pg3_mg17 grid have been updated to + use ne30pg3_t232. +- One test used the f19_f19 grid which used the gx1v6 mask. That test is + updated to use f19_f19_mg17. + +Describe any changes made to build system: + +Describe any changes made to the namelist: + +List any changes to the defaults for the boundary datasets: + +Describe any substantial timing or memory changes: + +Code reviewed by: + +List all files eliminated: + +List all files added and what they do: + +List all existing files that have been modified, and describe the changes: + +cime_config/testdefs/testlist_cam.xml +. update mask in ne30pg3 grids used for cam7 tests: + - tests of FLTHIST, FMTHIST, FHISTC_MTt1s, FHISTC_MTt4s, QPLT, and QPMT + using ne30pg3_ne30pg3_mg17 now use ne30pg3_t232 +. There is one test using the f19_f19 grid. This grid is using the gx1v6 + mask which will be removed. Update test to use f19_f19_mg17 grid. + +If there were any failures reported from running test_driver.sh on any test +platform, and checkin with these failures has been OK'd by the gatekeeper, +then copy the lines from the td.*.status files for the failed tests to the +appropriate machine below. All failed tests must be justified. + +derecho/intel/aux_cam: + +derecho/nvhpc/aux_cam: + +izumi/nag/aux_cam: + +izumi/gnu/aux_cam: + +CAM tag used for the baseline comparison tests if different than previous +tag: + +Summarize any changes to answers: BFB, only some test definitions have + changed. + +=============================================================== +=============================================================== + Tag name: cam6_4_056 Originator(s): fvitt Date: 16 Jan 2025 From 8e3c2ea9852602e70d6efb137ec12a01aed6a9da Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 4 Feb 2025 10:01:56 -0500 Subject: [PATCH 02/17] change ne30pg3_t232 to ne30pg3_ne30pg3_t232 --- .gitmodules | 6 +++--- cime_config/testdefs/testlist_cam.xml | 22 +++++++++++----------- doc/ChangeLog | 8 +++++++- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.gitmodules b/.gitmodules index 752c3bf4f7..5bc357564b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -143,10 +143,10 @@ 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.8 +url = https://github.com/brian-eaton/ccs_config_cesm.git +fxtag = cam_t232 fxrequired = ToplevelRequired -fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git +fxDONOTUSEurl = https://github.com/brian-eaton/ccs_config_cesm.git [submodule "cime"] path = cime diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 8b6dd22501..091d3bbbb1 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -199,7 +199,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -1886,7 +1886,7 @@ - + @@ -1895,7 +1895,7 @@ - + @@ -1904,7 +1904,7 @@ - + @@ -1913,7 +1913,7 @@ - + @@ -1922,7 +1922,7 @@ - + @@ -2376,7 +2376,7 @@ - + @@ -2386,7 +2386,7 @@ - + @@ -2395,7 +2395,7 @@ - + @@ -2404,7 +2404,7 @@ - + diff --git a/doc/ChangeLog b/doc/ChangeLog index 3f5f6a0169..036688d81d 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -31,10 +31,16 @@ List all files added and what they do: List all existing files that have been modified, and describe the changes: +.gitmodules + - update ccs_config module to: + url = https://github.com/brian-eaton/ccs_config_cesm.git + fxtag = cam_t232 +*** This is temporary until PR#211 is merged in ESMCI/ccs_config_cesm + cime_config/testdefs/testlist_cam.xml . update mask in ne30pg3 grids used for cam7 tests: - tests of FLTHIST, FMTHIST, FHISTC_MTt1s, FHISTC_MTt4s, QPLT, and QPMT - using ne30pg3_ne30pg3_mg17 now use ne30pg3_t232 + using ne30pg3_ne30pg3_mg17 now use ne30pg3_ne30pg3_t232 . There is one test using the f19_f19 grid. This grid is using the gx1v6 mask which will be removed. Update test to use f19_f19_mg17 grid. From e6cdecae1f24603420d7b04c6fdf9014ed9e7b7b Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 4 Feb 2025 16:20:15 -0500 Subject: [PATCH 03/17] change ne30pg3_ne30pg3_t232 to ne30pg3_ne30pg3_mt232 --- cime_config/testdefs/testlist_cam.xml | 22 +++++++++++----------- doc/ChangeLog | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 091d3bbbb1..3c690ba796 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -199,7 +199,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -1886,7 +1886,7 @@ - + @@ -1895,7 +1895,7 @@ - + @@ -1904,7 +1904,7 @@ - + @@ -1913,7 +1913,7 @@ - + @@ -1922,7 +1922,7 @@ - + @@ -2376,7 +2376,7 @@ - + @@ -2386,7 +2386,7 @@ - + @@ -2395,7 +2395,7 @@ - + @@ -2404,7 +2404,7 @@ - + diff --git a/doc/ChangeLog b/doc/ChangeLog index 036688d81d..159d8338ff 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -11,7 +11,7 @@ Purpose of changes (include the issue number and title text for each relevant Gi Resolves #1236 - Change our testing from using the POP land/ocean mask to the MOM t232 land/ocean mask - The cam7 tests using the ne30pg3_ne30pg3_mg17 grid have been updated to - use ne30pg3_t232. + use ne30pg3_ne30pg3_mt232. - One test used the f19_f19 grid which used the gx1v6 mask. That test is updated to use f19_f19_mg17. @@ -40,7 +40,7 @@ List all existing files that have been modified, and describe the changes: cime_config/testdefs/testlist_cam.xml . update mask in ne30pg3 grids used for cam7 tests: - tests of FLTHIST, FMTHIST, FHISTC_MTt1s, FHISTC_MTt4s, QPLT, and QPMT - using ne30pg3_ne30pg3_mg17 now use ne30pg3_ne30pg3_t232 + using ne30pg3_ne30pg3_mg17 now use ne30pg3_ne30pg3_mt232 . There is one test using the f19_f19 grid. This grid is using the gx1v6 mask which will be removed. Update test to use f19_f19_mg17 grid. From 145f90c556c451512df5825f5ba63d8d046c680e Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Wed, 5 Mar 2025 14:38:23 -0500 Subject: [PATCH 04/17] update modified submodule --- ccs_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccs_config b/ccs_config index f3cae52b30..c1f57b1db9 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit f3cae52b3096639d767778fa8033efe5e2d79cf0 +Subproject commit c1f57b1db90529fdc3766777103c8d6a9cd4ccb2 From 92ce9774f1e1535ce5db4edd03d3e29dfb5f6a85 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 7 Mar 2025 10:07:51 -0500 Subject: [PATCH 05/17] update CUPiD module --- tools/CUPiD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/CUPiD b/tools/CUPiD index 18c0e37022..fc3c63872d 160000 --- a/tools/CUPiD +++ b/tools/CUPiD @@ -1 +1 @@ -Subproject commit 18c0e370222070ae6b9bc061d3d404b115fdc1d3 +Subproject commit fc3c63872dc622d732b2c03fdefda66ce42bd3bf From 801a5c589e6d083cf5835c6f14e5035f46c1d14f Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 7 Mar 2025 11:38:01 -0500 Subject: [PATCH 06/17] use ccs_config_cesm1.0.22 and revert CUPiD to v0.1.4 --- .gitmodules | 4 ++-- doc/ChangeLog | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6c1307249b..a43cd434b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -144,7 +144,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.23 +fxtag = ccs_config_cesm1.0.22 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git @@ -207,7 +207,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface [submodule "tools/CUPiD"] path = tools/CUPiD url = https://github.com/NCAR/CUPiD.git -fxtag = v0.2.0 +fxtag = v0.1.4 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git diff --git a/doc/ChangeLog b/doc/ChangeLog index 2a1f580b5f..0e11ab2abd 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -32,8 +32,7 @@ List all files added and what they do: List all existing files that have been modified, and describe the changes: .gitmodules - - update ccs_config_cesm1.0.21 to ccs_config_cesm1.0.23 - - update CUPiD from v0.1.4 to v0.2.0 + - update ccs_config_cesm1.0.21 to ccs_config_cesm1.0.22 cime_config/testdefs/testlist_cam.xml . update mask in ne30pg3 grids used for cam7 tests: From 4149f04e541d60dd647d5606d92c72f7a5a78954 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 7 Mar 2025 11:45:39 -0500 Subject: [PATCH 07/17] update ccs_config and CUPiD submodules --- ccs_config | 2 +- tools/CUPiD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccs_config b/ccs_config index c1f57b1db9..bcb56e6d52 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit c1f57b1db90529fdc3766777103c8d6a9cd4ccb2 +Subproject commit bcb56e6d52235521bcf2066da0dee5fb368ef673 diff --git a/tools/CUPiD b/tools/CUPiD index fc3c63872d..18c0e37022 160000 --- a/tools/CUPiD +++ b/tools/CUPiD @@ -1 +1 @@ -Subproject commit fc3c63872dc622d732b2c03fdefda66ce42bd3bf +Subproject commit 18c0e370222070ae6b9bc061d3d404b115fdc1d3 From bd0fa862b1cc7a32e649eeef809c81f33e6b743a Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Mon, 10 Mar 2025 18:00:26 -0400 Subject: [PATCH 08/17] update externals; compset name changes --- .gitmodules | 8 ++--- cime_config/config_compsets.xml | 11 ++---- cime_config/testdefs/testlist_cam.xml | 35 +++++-------------- doc/ChangeLog | 50 +++++++++++++++++---------- 4 files changed, 47 insertions(+), 57 deletions(-) diff --git a/.gitmodules b/.gitmodules index f8feb030ca..f187b6d575 100644 --- a/.gitmodules +++ b/.gitmodules @@ -144,28 +144,28 @@ 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.22 +fxtag = ccs_config_cesm1.0.26 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git [submodule "cime"] path = cime url = https://github.com/ESMCI/cime -fxtag = cime6.1.58 +fxtag = cime6.1.72 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git -fxtag = cmeps1.0.33 +fxtag = cmeps1.0.39 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git [submodule "cdeps"] path = components/cdeps url = https://github.com/ESCOMP/CDEPS.git -fxtag = cdeps1.0.61 +fxtag = cdeps1.0.69 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 87edf876be..9f14b71232 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -53,12 +53,12 @@ - FLTHIST + FHISTC_LTso HIST_CAM70%LT_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV - FMTHIST + FHISTC_MTso HIST_CAM70%MT_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV @@ -245,15 +245,10 @@ - QPLT + QPC7 2000_CAM70%LT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV - - QPMT - 2000_CAM70%MT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV - - QPC2000climo 2000_CAM60%CT1S_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 72c1af1551..71a186aa8b 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -209,25 +209,6 @@ - - - - - - - - - - - - - - - - - - - @@ -1727,7 +1708,7 @@ - + @@ -1736,7 +1717,7 @@ - + @@ -1745,7 +1726,7 @@ - + @@ -1754,7 +1735,7 @@ - + @@ -1763,7 +1744,7 @@ - + @@ -1772,7 +1753,7 @@ - + diff --git a/doc/ChangeLog b/doc/ChangeLog index 33b25838ab..8b6e4af1fd 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,38 +1,51 @@ =============================================================== -Tag name: -Originator(s): +Tag name: cam6_4_076 +Originator(s): eaton Date: -One-line Summary: updates to grid masks -Github PR URL: +One-line Summary: updates to grid masks; update externals +Github PR URL: https://github.com/ESCOMP/CAM/pull/1246 Purpose of changes (include the issue number and title text for each relevant GitHub issue): Resolves #1236 - Change our testing from using the POP land/ocean mask to the MOM t232 land/ocean mask -- The cam7 tests using the ne30pg3_ne30pg3_mg17 grid have been updated to - use ne30pg3_ne30pg3_mt232. -- One test used the f19_f19 grid which used the gx1v6 mask. That test is - updated to use f19_f19_mg17. + - The cam7 tests using the ne30pg3_ne30pg3_mg17 grid have been updated to + use ne30pg3_ne30pg3_mt232. + - One test used the f19_f19 grid which used the gx1v6 mask. That test is + updated to use f19_f19_mg17. -Describe any changes made to build system: +. Update compset names: FHISTC_LTso, FHISTC_MTso, QPC7 -Describe any changes made to the namelist: +. Update externals -List any changes to the defaults for the boundary datasets: +Describe any changes made to build system: none -Describe any substantial timing or memory changes: +Describe any changes made to the namelist: none -Code reviewed by: +List any changes to the defaults for the boundary datasets: none -List all files eliminated: +Describe any substantial timing or memory changes: not checked -List all files added and what they do: +Code reviewed by: adamrher, cacraigucar + +List all files eliminated: none + +List all files added and what they do: none List all existing files that have been modified, and describe the changes: .gitmodules - - update ccs_config_cesm1.0.21 to ccs_config_cesm1.0.22 + - update ccs_config_cesm1.0.21 to ccs_config_cesm1.0.26 + - update cime6.1.58 to cime6.1.72 + - update cmeps1.0.33 to cmeps1.0.39 + - update cdeps1.0.61 to cdeps1.0.69 + +cime_config/config_compsets.xml +. FLTHIST changed to FHISTC_LTso +. FMTHIST changed to FHISTC_MTso +. QPLT changed to QPC7 +. QPMT removed cime_config/testdefs/testlist_cam.xml . update mask in ne30pg3 grids used for cam7 tests: @@ -40,6 +53,7 @@ cime_config/testdefs/testlist_cam.xml using ne30pg3_ne30pg3_mg17 now use ne30pg3_ne30pg3_mt232 . There is one test using the f19_f19 grid. This grid is using the gx1v6 mask which will be removed. Update test to use f19_f19_mg17 grid. +. Update the compset names. If there were any failures reported from running test_driver.sh on any test platform, and checkin with these failures has been OK'd by the gatekeeper, @@ -57,8 +71,8 @@ izumi/gnu/aux_cam: CAM tag used for the baseline comparison tests if different than previous tag: -Summarize any changes to answers: BFB, only some test definitions have - changed. +Summarize any changes to answers: Answer changes expected due to updated + ccs_config external. =============================================================== =============================================================== From 0c7549763c5e4c406cfb0b804015e07217561728 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Mon, 10 Mar 2025 18:11:03 -0400 Subject: [PATCH 09/17] update submodules --- ccs_config | 2 +- cime | 2 +- components/cdeps | 2 +- components/cmeps | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ccs_config b/ccs_config index bcb56e6d52..82b28635e8 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit bcb56e6d52235521bcf2066da0dee5fb368ef673 +Subproject commit 82b28635e8c83b58840a833176e48a6bff8267dc diff --git a/cime b/cime index cdf76d6919..71d2b71216 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit cdf76d691961d697feafc14907f81b9c195dfe99 +Subproject commit 71d2b71216cc39abfb8224cc55861bd6424c95f9 diff --git a/components/cdeps b/components/cdeps index 0750c91753..3f37963f69 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit 0750c9175395d3ba3bf8eba65703dee230d08572 +Subproject commit 3f37963f69f71379d7017772b5d058d73d3857d6 diff --git a/components/cmeps b/components/cmeps index 4b636c6f79..189b02e2b3 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 4b636c6f794ca02d854d15c620e26644751b449b +Subproject commit 189b02e2b36b9a5a064150179721de45af3bbacf From f9301e8bfeee2dbf15674e5ea1c7d8296294674c Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 11 Mar 2025 12:11:10 -0400 Subject: [PATCH 10/17] update to ccs_config_cesm1.0.28 --- .gitmodules | 2 +- doc/ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index f187b6d575..d5098e28db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -144,7 +144,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.26 +fxtag = ccs_config_cesm1.0.28 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git diff --git a/doc/ChangeLog b/doc/ChangeLog index 8b6e4af1fd..42dfb00db3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -36,7 +36,7 @@ List all files added and what they do: none List all existing files that have been modified, and describe the changes: .gitmodules - - update ccs_config_cesm1.0.21 to ccs_config_cesm1.0.26 + - update ccs_config_cesm1.0.21 to ccs_config_cesm1.0.28 - update cime6.1.58 to cime6.1.72 - update cmeps1.0.33 to cmeps1.0.39 - update cdeps1.0.61 to cdeps1.0.69 From 22a6a406b635ed172356b10ea38dc61a3c5a0ef6 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 11 Mar 2025 12:28:56 -0400 Subject: [PATCH 11/17] update submodules --- ccs_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccs_config b/ccs_config index 82b28635e8..e1e17a0af3 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 82b28635e8c83b58840a833176e48a6bff8267dc +Subproject commit e1e17a0af37fd2620a0a55cb0d4004f00f778a23 From 5151264851d56b15692cc629a8aca99d080ea7db Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Wed, 12 Mar 2025 19:10:55 -0400 Subject: [PATCH 12/17] update submodules --- .gitmodules | 8 ++++---- ccs_config | 2 +- components/cice | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index d5098e28db..b0e59cb8cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -143,10 +143,10 @@ 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.28 +url = https://github.com/jedwards4b/ccs_config_cesm.git +fxtag = back_out_ifx fxrequired = ToplevelRequired -fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git +fxDONOTUSEurl = https://github.com/jedwards4b/ccs_config_cesm.git [submodule "cime"] path = cime @@ -186,7 +186,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO [submodule "cice"] path = components/cice url = https://github.com/ESCOMP/CESM_CICE -fxtag = cesm3_cice6_6_0_6 +fxtag = cesm3_cice6_6_0_8 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE diff --git a/ccs_config b/ccs_config index e1e17a0af3..f20292beed 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit e1e17a0af37fd2620a0a55cb0d4004f00f778a23 +Subproject commit f20292beed663f38c7f726947f3cd320c8a96b9d diff --git a/components/cice b/components/cice index e51ab1d3f1..992ac74b77 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit e51ab1d3f12ae2959b7df978f77dc5a1ee0181d3 +Subproject commit 992ac74b77277fc6d0ae9fdd23fe6ef8f797d5e2 From 5907eba913bdc67ed7426b9c72186b1dd4157e24 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 14 Mar 2025 10:36:42 -0400 Subject: [PATCH 13/17] update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index b0e59cb8cc..7e9ab971be 100644 --- a/.gitmodules +++ b/.gitmodules @@ -186,7 +186,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO [submodule "cice"] path = components/cice url = https://github.com/ESCOMP/CESM_CICE -fxtag = cesm3_cice6_6_0_8 +fxtag = cesm3_cice6_6_0_6 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE From 43718523bacc84fcd4a388c9dec306f430aefb9d Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 14 Mar 2025 10:43:28 -0400 Subject: [PATCH 14/17] update submodules --- ccs_config | 2 +- components/cice | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccs_config b/ccs_config index f20292beed..94af4785ef 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit f20292beed663f38c7f726947f3cd320c8a96b9d +Subproject commit 94af4785ef720db0a86a13d1ac7fa3635e341adb diff --git a/components/cice b/components/cice index 992ac74b77..e51ab1d3f1 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit 992ac74b77277fc6d0ae9fdd23fe6ef8f797d5e2 +Subproject commit e51ab1d3f12ae2959b7df978f77dc5a1ee0181d3 From ff79926adace8e08086ca6f706d5ee5a08a66234 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 14 Mar 2025 11:58:04 -0400 Subject: [PATCH 15/17] update ccs_config_cesm --- .gitmodules | 6 +++--- doc/ChangeLog | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7e9ab971be..a77b99743f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -143,10 +143,10 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config -url = https://github.com/jedwards4b/ccs_config_cesm.git -fxtag = back_out_ifx +url = https://github.com/ESMCI/ccs_config_cesm.git +fxtag = ccs_config_cesm1.0.29 fxrequired = ToplevelRequired -fxDONOTUSEurl = https://github.com/jedwards4b/ccs_config_cesm.git +fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git [submodule "cime"] path = cime diff --git a/doc/ChangeLog b/doc/ChangeLog index 42dfb00db3..376d3c7d5e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -36,7 +36,7 @@ List all files added and what they do: none List all existing files that have been modified, and describe the changes: .gitmodules - - update ccs_config_cesm1.0.21 to ccs_config_cesm1.0.28 + - update ccs_config_cesm1.0.21 to ccs_config_cesm1.0.29 - update cime6.1.58 to cime6.1.72 - update cmeps1.0.33 to cmeps1.0.39 - update cdeps1.0.61 to cdeps1.0.69 @@ -72,7 +72,7 @@ CAM tag used for the baseline comparison tests if different than previous tag: Summarize any changes to answers: Answer changes expected due to updated - ccs_config external. + intel and nvhpc compilers in ccs_config external. =============================================================== =============================================================== From 9f47508092d4e16b2fae50ac69aee129094db6fe Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 14 Mar 2025 12:23:36 -0400 Subject: [PATCH 16/17] update submodule dirs --- ccs_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccs_config b/ccs_config index 94af4785ef..060abc0eb1 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 94af4785ef720db0a86a13d1ac7fa3635e341adb +Subproject commit 060abc0eb11d57731ac11dd80762dd9d97cd92f3 From 5e5f1d47868675c2d0365cb5b2f527f3cd489fde Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Mon, 17 Mar 2025 10:36:49 -0400 Subject: [PATCH 17/17] update ChangeLog --- doc/ChangeLog | 72 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 3 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 376d3c7d5e..230a20a195 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -2,7 +2,7 @@ Tag name: cam6_4_076 Originator(s): eaton -Date: +Date: 17 March 2025 One-line Summary: updates to grid masks; update externals Github PR URL: https://github.com/ESCOMP/CAM/pull/1246 @@ -61,18 +61,84 @@ then copy the lines from the td.*.status files for the failed tests to the appropriate machine below. All failed tests must be justified. derecho/intel/aux_cam: +ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) details: +SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF) details: + - pre-existing failures due to HEMCO not having reproducible results (issues #1018 and #856) + +SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL) +SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) + - pre-existing failures due to build-namelist error requiring CLM/CTSM external update + +ERC_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq3s_cosp (Overall: DIFF) +ERC_D_Ln9.f19_f19_mg17.QPMOZ.derecho_intel.cam-outfrq3s (Overall: DIFF) +ERC_D_Ln9.f19_f19_mg17.QPX2000.derecho_intel.cam-outfrq3s (Overall: DIFF) +ERC_D_Ln9.ne16_ne16_mg17.QPC5HIST.derecho_intel.cam-outfrq3s_usecase (Overall: DIFF) +ERC_D_Ln9_P144x1.ne16pg3_ne16pg3_mg17.QPC6HIST.derecho_intel.cam-outfrq3s_ttrac_usecase (Overall: DIFF) +ERI_D_Ln18.f45_f45_mg37.QPC41850.derecho_intel.cam-co2rmp_usecase (Overall: DIFF) +ERP_D_Ln9_P64x2.f09_f09_mg17.QSC6.derecho_intel.cam-outfrq9s (Overall: DIFF) +ERP_Ld3.f09_f09_mg17.FWHIST.derecho_intel.cam-reduced_hist1d (Overall: DIFF) +ERP_Lh12.f19_f19_mg17.FW4madSD.derecho_intel.cam-outfrq3h (Overall: DIFF) +ERP_Ln9.C96_C96_mg17.F2000climo.derecho_intel.cam-outfrq9s_mg3 (Overall: DIFF) +ERP_Ln9.f09_f09_mg17.F1850.derecho_intel.cam-outfrq9s (Overall: DIFF) +ERP_Ln9.f09_f09_mg17.F2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) +ERP_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-outfrq9s (Overall: DIFF) +ERP_Ln9.f09_f09_mg17.FHIST_BDRD.derecho_intel.cam-outfrq9s (Overall: DIFF) +ERP_Ln9.f19_f19_mg17.FWsc1850.derecho_intel.cam-outfrq9s (Overall: DIFF) +ERP_Ln9.ne30pg3_ne30pg3_mg17.FCnudged.derecho_intel.cam-outfrq9s (Overall: DIFF) +ERP_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) +ERS_D_Ln9.mpasa480_mpasa480.F2000climo.derecho_intel.cam-outfrq9s_mpasa480_pertlim (Overall: DIFF) +ERS_Ln9.f09_f09_mg17.FX2000.derecho_intel.cam-outfrq9s (Overall: DIFF) +ERS_Ln9.f19_f19_mg17.FXSD.derecho_intel.cam-outfrq9s (Overall: DIFF) +ERS_Ln9_P288x1.mpasa120_mpasa120.F2000climo.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) +SCT_D_Ln7.ne3_ne3_mg37.QPC5.derecho_intel.cam-scm_prep (Overall: DIFF) +SMS_D_Ld2.f19_f19_mg17.QPC5HIST.derecho_intel.cam-volc_usecase (Overall: DIFF) +SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday (Overall: DIFF) +SMS_D_Ln9.f09_f09_mg17.FCvbsxHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) +SMS_D_Ln9.f09_f09_mg17.FSD.derecho_intel.cam-outfrq9s (Overall: DIFF) +SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) +SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s_waccm_ma_mam4 (Overall: DIFF) +SMS_D_Ln9.f19_f19_mg17.QPC2000climo.derecho_intel.cam-outfrq3s_usecase (Overall: DIFF) +SMS_D_Ln9.f19_f19_mg17.QPC5M7.derecho_intel.cam-outfrq9s (Overall: DIFF) +SMS_D_Ln9.ne16_ne16_mg17.QPX2000.derecho_intel.cam-outfrq9s (Overall: DIFF) +SMS_D_Ln9.ne16pg3_ne16pg3_mg17.FX2000.derecho_intel.cam-outfrq9s (Overall: DIFF) +SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) +SMS_Ld1.f09_f09_mg17.FW2000climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details: +SMS_Ld1.ne30pg3_ne30pg3_mg17.FC2010climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details: +SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h (Overall: DIFF) details: +SMS_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-nudging (Overall: DIFF) details: +SMS_Ln9.f09_f09_mg17.FW1850.derecho_intel.cam-reduced_hist3s (Overall: DIFF) details: +SMS_Ln9.f19_f19_mg17.FHIST.derecho_intel.cam-outfrq9s_nochem (Overall: DIFF) details: +SMS_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s_rrtmgp (Overall: DIFF) details: + - Diffs due to externals updates + +ERP_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s (Overall: DIFF) +ERP_D_Ln9.ne30pg3_ne30pg3_mt232.QPC7.derecho_intel.cam-outfrq3s_cosp (Overall: DIFF) +ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) +SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) +SMS_Ln9.f19_f19_mg17.F2000climo.derecho_intel.cam-silhs (Overall: DIFF) + - Diffs due to new masks, no baselines for comparisons derecho/nvhpc/aux_cam: -izumi/nag/aux_cam: +ERS_Ln9.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: DIFF) + - Diffs due to externals updates + +izumi/nag/aux_cam: All PASS. izumi/gnu/aux_cam: +ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FHISTC_LTso.izumi_gnu.cam-outfrq9s (Overall: DIFF) +ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC7.izumi_gnu.cam-outfrq9s (Overall: DIFF) +ERR_D_Ln9.ne3pg3_ne3pg3_mg37.FHISTC_LTso.izumi_gnu.cam-outfrq9s (Overall: DIFF) + - no baselines for comparison due to compset name change + CAM tag used for the baseline comparison tests if different than previous tag: Summarize any changes to answers: Answer changes expected due to updated - intel and nvhpc compilers in ccs_config external. + intel and nvhpc compilers in ccs_config external. NAG and GNU testing + are BFB. =============================================================== ===============================================================