From bb2f6212d2c8b944ba51b3193104826dac705ca2 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Fri, 1 Nov 2024 12:03:16 -0600 Subject: [PATCH 1/6] Update for cesm3_0_alpha04b --- .gitmodules | 6 ++--- ChangeLog | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index aad6c3c2b..f9801ee26 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,14 +73,14 @@ url = https://github.com/ESCOMP/CESM_CICE fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE fxrequired = ToplevelRequired - fxtag = cesm_cice6_5_0_12 + fxtag = cesm3_cice6_5_0_14 [submodule "mom"] path = components/mom url = https://github.com/ESCOMP/MOM_interface fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface fxrequired = ToplevelRequired - fxtag = mi_240923 + fxtag = mi_241101 [submodule "cism"] path = components/cism @@ -94,7 +94,7 @@ url = https://github.com/ESCOMP/CDEPS fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS fxrequired = ToplevelRequired - fxtag = cdeps1.0.53 + fxtag = cdeps1.0.55 [submodule "cmeps"] path = components/cmeps diff --git a/ChangeLog b/ChangeLog index f09d09aa3..9bd00e639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,75 @@ +============================================================== +Tag name: cesm3_0_alpha04b +Originator(s): CSEG +Date: 1st November 2024 +One-line Summary: Ocean model updates + +components/cam https://github.com/ESCOMP/CAM/cam6_4_032 -- +components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm3_cice6_5_0_14 ** +cime https://github.com/ESMCI/cime/tree/cime6.1.29 -- +share https://github.com/ESCOMP/CESM_share/tree/share1.1.2 -- +ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.7 -- +components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.16 -- +components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.55 ** +components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_002 -- +components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.3.007 -- +components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240822 -- +components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.3 -- +components/mom https://github.com/ESCOMP/MOM_interface/mi_241101 ** +components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_1_02 -- +components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_80 -- +components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/main_0.0.14 -- +libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_3 -- +tools/CUPiD https://github.com/NCAR/CUPiD/tree/v0.1.1 -- + +cdeps + Alper Altuntas 2024-10-30 - cdeps1.0.55 - components/cdeps (cesm3_0_alpha04b) + https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.55 + + add new JRA 1.5 streams for datm and drof. Changes answers for all MOM6 JRA (IAF) tests. + + +cice + David Bailey 2024-09-19 - cesm3_cice6_5_0_14 - components/cice (cesm3_0_alpha04b) + https://github.com/ESCOMP/CESM_CICE/tags/cesm3_cice6_5_0_3 + + This tag adds all of the new science capabilities for CICE. Several of these physics options + have been turned on by default along with a number of additional history variables. I have had + to temporarily back out the tr_pond_sealvl physics and the grid_ice = 'C' changes. There was a + restart issue with the sealvl ponds, but a fix is coming soon. + + I have also updated to the head of the CICE consortium code. Note there is one history variable + (sndmasssubl) which is not restarting exactly. This is only diagnostic and I am working + on it. + + Turn off CMIP variables for now. + + I have added the write restart at end of run capability as well. + + I have updated config_compsets.xml and config_pes.xml for the DTEST compset. + + + I have mostly fixed the aux_cice testlist, but there is more to come here. I have also + updated the path for the MOM grid files. + + +mom + Michael Levy 2024-10-11 - mi_241101 - components/mom (cesm3_0_alpha04b) + https://github.com/ESCOMP/MOM_interface/tags/mi_2410?? + + Update remap correction computation to pass dimensional scaling test. + Stokes MOST and FPMix updates. + JRA streams update. + Update MARBL driver to pass restart tests + + + Michael Levy 2024-08-02 - mi_241007 - components/mom (cesm3_0_alpha04b) + https://github.com/ESCOMP/MOM_interface/tags/mi_2408?? + + Update MOM6 and MARBL tags to support nvhpc (at least for standalone MOM6 examples) + -- The new MARBL tag introduces a round-off level change in how NHx ocn-atm flux is computed, + so most tests with MARBL enabled will change answers. Bit-for-bit without MARBL tracers. + ============================================================== Tag name: cesm3_0_alpha04a Originator(s): CSEG From e715b06e7ff6ba8b6541cce8405344385fd0b43d Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Fri, 1 Nov 2024 12:11:16 -0600 Subject: [PATCH 2/6] Update for cesm3_0_alpha04b testing. --- .gitmodules | 2 +- ChangeLog | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index f9801ee26..4cd20ef75 100644 --- a/.gitmodules +++ b/.gitmodules @@ -51,7 +51,7 @@ path = share url = https://github.com/ESCOMP/CESM_share fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share - fxtag = share1.1.2 + fxtag = share1.1.4 fxrequired = ToplevelRequired [submodule "cam"] diff --git a/ChangeLog b/ChangeLog index 9bd00e639..eca7459cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ One-line Summary: Ocean model updates components/cam https://github.com/ESCOMP/CAM/cam6_4_032 -- components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm3_cice6_5_0_14 ** cime https://github.com/ESMCI/cime/tree/cime6.1.29 -- -share https://github.com/ESCOMP/CESM_share/tree/share1.1.2 -- +share https://github.com/ESCOMP/CESM_share/tree/share1.1.4 ** ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.7 -- components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.16 -- components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.55 ** @@ -26,7 +26,8 @@ cdeps Alper Altuntas 2024-10-30 - cdeps1.0.55 - components/cdeps (cesm3_0_alpha04b) https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.55 - add new JRA 1.5 streams for datm and drof. Changes answers for all MOM6 JRA (IAF) tests. + cdeps1.0.55: Add new JRA 1.5 streams for datm and drof. Changes answers for all MOM6 JRA (IAF) tests. + cdeps1.0.54: Add rpointer timestamp cice @@ -70,6 +71,14 @@ mom -- The new MARBL tag introduces a round-off level change in how NHx ocn-atm flux is computed, so most tests with MARBL enabled will change answers. Bit-for-bit without MARBL tracers. + +share + Chris Fischer 2024-11-01 - share1.1.4 - share (cesm3_0_alpha04b) + https://github.com/ESCOMP/CESM_share/tags/share1.1.4 + + share1.1.4: Refactor the minimum_timestep function into a loop over components. + share1.1.3: Add a routine to get the rpointer file names with timestamps. + ============================================================== Tag name: cesm3_0_alpha04a Originator(s): CSEG From eb3f174475efc2af279138e28cef403b8e847544 Mon Sep 17 00:00:00 2001 From: "Chris A. Fischer" Date: Tue, 5 Nov 2024 16:51:05 -0700 Subject: [PATCH 3/6] Update for cesm3_0_alpha04b to fix some testing. --- .gitmodules | 8 ++++---- ChangeLog | 38 ++++++++++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4cd20ef75..27550162a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,7 +30,7 @@ path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git - fxtag = ccs_config_cesm1.0.7 + fxtag = ccs_config_cesm1.0.8 fxrequired = ToplevelRequired [submodule "cime"] @@ -51,7 +51,7 @@ path = share url = https://github.com/ESCOMP/CESM_share fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share - fxtag = share1.1.4 + fxtag = share1.1.5 fxrequired = ToplevelRequired [submodule "cam"] @@ -80,7 +80,7 @@ url = https://github.com/ESCOMP/MOM_interface fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface fxrequired = ToplevelRequired - fxtag = mi_241101 + fxtag = mi_241104 [submodule "cism"] path = components/cism @@ -142,7 +142,7 @@ path = libraries/mpi-serial url = https://github.com/ESMCI/mpi-serial fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial - fxtag = MPIserial_2.5.0 + fxtag = MPIserial_2.5.1 fxrequired = ToplevelRequired [submodule "pysect"] diff --git a/ChangeLog b/ChangeLog index eca7459cc..12a4da03e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,27 +1,35 @@ ============================================================== Tag name: cesm3_0_alpha04b Originator(s): CSEG -Date: 1st November 2024 +Date: 5th November 2024 One-line Summary: Ocean model updates components/cam https://github.com/ESCOMP/CAM/cam6_4_032 -- components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm3_cice6_5_0_14 ** cime https://github.com/ESMCI/cime/tree/cime6.1.29 -- -share https://github.com/ESCOMP/CESM_share/tree/share1.1.4 ** -ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.7 -- +share https://github.com/ESCOMP/CESM_share/tree/share1.1.5 ** +ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.8 ** components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.16 -- components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.55 ** components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_002 -- components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.3.007 -- components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240822 -- components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.3 -- -components/mom https://github.com/ESCOMP/MOM_interface/mi_241101 ** +components/mom https://github.com/ESCOMP/MOM_interface/mi_241104 ** components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_1_02 -- components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_80 -- components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/main_0.0.14 -- libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_3 -- +libraries/mpi-serial https://github.com/ESMCI/mpi-serial/tree/MPIserial_2.5.0 ** tools/CUPiD https://github.com/NCAR/CUPiD/tree/v0.1.1 -- +ccs_config + James Edwards 2024-11-04 - ccs_config_cesm1.0.8 - ccs_config (cesm3_0_alpha04b) + https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config1.0.8 + + Needed for gpu related xml changes. + + cdeps Alper Altuntas 2024-10-30 - cdeps1.0.55 - components/cdeps (cesm3_0_alpha04b) https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.55 @@ -55,6 +63,15 @@ cice mom + Chris Fischer 2024-11-05 - mi_241104 - components/mom (cesm3_0_alpha04b) + https://github.com/ESCOMP/MOM_interface/tags/mi_241104 + + Fix rpointer check in buildnml (#204) + * account for date stamps while checking whether rpointer files exist + + * accomodate old rpointer file naming in builnml check + + Michael Levy 2024-10-11 - mi_241101 - components/mom (cesm3_0_alpha04b) https://github.com/ESCOMP/MOM_interface/tags/mi_2410?? @@ -72,7 +89,20 @@ mom so most tests with MARBL enabled will change answers. Bit-for-bit without MARBL tracers. +mpi-serial + Chris Fischer 2024-11-05 - MPIserial_2.5.1 - libraries/mpi-serial (cesm3_0_alpha04b) + https://github.com/ESMCI/mpi-serial/tags/MPIserial_2.5.1 + + Add configure script to distribution + + share + Chris Fischer 2024-11-05 - share1.1.5 - share (cesm3_0_alpha04b) + https://github.com/ESCOMP/CESM_share/tags/share1.1.5 + + Make sure rpfile has no left space + + Chris Fischer 2024-11-01 - share1.1.4 - share (cesm3_0_alpha04b) https://github.com/ESCOMP/CESM_share/tags/share1.1.4 From 866d283feaaec3b0b0afaa6538107a4c0e89e64b Mon Sep 17 00:00:00 2001 From: "Chris A. Fischer" Date: Wed, 6 Nov 2024 09:13:10 -0700 Subject: [PATCH 4/6] Update cdeps for alpha04b --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 27550162a..a4b0b11a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -94,7 +94,7 @@ url = https://github.com/ESCOMP/CDEPS fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS fxrequired = ToplevelRequired - fxtag = cdeps1.0.55 + fxtag = cdeps1.0.57 [submodule "cmeps"] path = components/cmeps From 291fbc1d8b22d98746bc6aec8289b451a94deecc Mon Sep 17 00:00:00 2001 From: "Chris A. Fischer" Date: Wed, 6 Nov 2024 09:59:41 -0700 Subject: [PATCH 5/6] Update cdeps. --- ChangeLog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 12a4da03e..7872011cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,7 @@ cime https://github.com/ESMCI/cime/tree/cime6.1.29 share https://github.com/ESCOMP/CESM_share/tree/share1.1.5 ** ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.8 ** components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.16 -- -components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.55 ** +components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.57 ** components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_002 -- components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.3.007 -- components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240822 -- @@ -31,6 +31,13 @@ ccs_config cdeps + Chris Fischer 2024-11-06 - cdeps1.0.57 - components/cdeps (cesm3_0_alpha04b) + https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.57 + + cdeps1.0.57: Backout the timestamp on rpointer files until alpha05c. + cdeps1.0.56: Change nextsw_cday calculation for cam_dev (CAM7) in cplhist mode + Greater than roundoff-level changes in cases using datm in CPLHIST mode. + Alper Altuntas 2024-10-30 - cdeps1.0.55 - components/cdeps (cesm3_0_alpha04b) https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.55 From 83fb97397c16d4010c20cc5e7f9b46bf36b9ccb3 Mon Sep 17 00:00:00 2001 From: Chris Fischer Date: Fri, 8 Nov 2024 10:33:37 -0700 Subject: [PATCH 6/6] Remove unsupported compsets and update wallclocks. --- cime_config/testlist_allactive.xml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml index eab7ee63f..59f5ec73c 100644 --- a/cime_config/testlist_allactive.xml +++ b/cime_config/testlist_allactive.xml @@ -91,24 +91,6 @@ - - - - - - - - - - - - - - - - - - @@ -158,14 +140,6 @@ - - - - - - - -