Merge branch 'cesm3.0-alphabranch'

ESCOMP · Nov 8, 2024 · 9ccc384 · 9ccc384
2 parents 993f085 + 83fb973
commit 9ccc384
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 32 deletions.
diff --git 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.2
+        fxtag = share1.1.5
         fxrequired = ToplevelRequired
 
 [submodule "cam"]
@@ -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_241104
 
 [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.57
 
 [submodule "cmeps"]
         path = components/cmeps
@@ -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
@@ -1,3 +1,121 @@
+==============================================================
+Tag name: cesm3_0_alpha04b
+Originator(s): CSEG
+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.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.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                --
+components/mizuroute    https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.3     --
+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
+    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
+
+    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
+    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
+    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??
+
+    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.
+
+
+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
+
+    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

diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml
@@ -91,24 +91,6 @@
       <option name="wallclock"> 06:00:00 </option>
     </options>
   </test>
-  <test name="SMS_Ld1" grid="f09_t232" compset="BW1850" testmods="allactive/defaultio">
-    <machines>
-      <machine name="derecho" compiler="intel" category="prebeta"/>
-      <machine name="derecho" compiler="intel" category="bwaccm"/>
-    </machines>
-    <options>
-      <option name="wallclock"> 01:00:00 </option>
-    </options>
-  </test>
-  <test name="SMS_Ld1" grid="f09_t232" compset="BWma1850" testmods="allactive/defaultio">
-    <machines>
-      <machine name="derecho" compiler="intel" category="prebeta"/>
-      <machine name="derecho" compiler="intel" category="bwaccm"/>
-    </machines>
-    <options>
-      <option name="wallclock"> 01:00:00 </option>
-    </options>
-  </test>
   <test name="ERS_Ld5" grid="f09_t232" compset="E1850TEST" testmods="cice/default">
     <machines>
       <machine name="derecho" compiler="intel" category="prebeta"/>
@@ -158,14 +140,6 @@
       <machine name="derecho" compiler="intel" category="aux_perf"/>
     </machines>
   </test>
-  <test name="SMS_Ld5" grid="f09_t232_gl4" compset="J1850G" testmods="allactive/cism/test_coupling">
-    <machines>
-      <machine name="derecho" compiler="gnu" category="prebeta"/>
-    </machines>
-    <options>
-      <option name="wallclock"> 00:30:00 </option>
-    </options>
-  </test>
   <test name="SMS_Ld7" grid="f09_t232" compset="BLT1850" testmods="allactive/defaultio">
     <machines>
       <machine name="derecho" compiler="intel" category="prealpha"/>