Update mom6 to its main repo. 20260828 commit

.github/workflows/verify-macos.yml

@@ -19,22 +19,23 @@ jobs:
     runs-on: macOS-latest
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup/
 
-      - name: Compile FMS
-        run: make -C .testing -j build/deps/lib/libFMS.a
+      - name: Compile dependencies
+        run: |
+          make -C .testing -j build/deps/lib/libFMS.a
+          make -C .testing -j PKG= build/deps/lib/libgsw.a
+          make -C .testing -j PKG= build/deps/lib/libcvmix.a
 
       - name: Compile MOM6 with symmetric indexing
         run: make -C .testing -j build/symmetric/MOM6
 
       - name: Prepare artifact
         run: tar -cf mom6-symmetric.tar .testing/build/symmetric/MOM6
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: mom6-symmetric-artifact
           path: mom6-symmetric.tar
@@ -44,22 +45,23 @@ jobs:
     runs-on: macOS-latest
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup/
 
-      - name: Compile FMS
-        run: make -C .testing -j build/deps/lib/libFMS.a
+      - name: Compile dependencies
+        run: |
+          make -C .testing -j build/deps/lib/libFMS.a
+          make -C .testing -j PKG= build/deps/lib/libgsw.a
+          make -C .testing -j PKG= build/deps/lib/libcvmix.a
 
       - name: Compile MOM6 with asymmetric indexing
         run: make -C .testing -j build/asymmetric/MOM6
 
       - name: Prepare artifact
         run: tar -cf mom6-asymmetric.tar .testing/build/asymmetric/MOM6
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: mom6-asymmetric-artifact
           path: mom6-asymmetric.tar
@@ -69,22 +71,23 @@ jobs:
     runs-on: macOS-latest
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup/
 
-      - name: Compile FMS
-        run: make -C .testing -j build/deps/lib/libFMS.a
+      - name: Compile dependencies
+        run: |
+          make -C .testing -j build/deps/lib/libFMS.a
+          make -C .testing -j PKG= build/deps/lib/libgsw.a
+          make -C .testing -j PKG= build/deps/lib/libcvmix.a
 
       - name: Compile MOM6 with bit-reproducible optimization
         run: make -C .testing -j build/repro/MOM6
 
       - name: Prepare artifact
         run: tar -cf mom6-repro.tar .testing/build/repro/MOM6
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: mom6-repro-artifact
           path: mom6-repro.tar
@@ -94,22 +97,23 @@ jobs:
     runs-on: macOS-latest
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup/
 
-      - name: Compile FMS
-        run: make -C .testing -j build/deps/lib/libFMS.a
+      - name: Compile dependencies
+        run: |
+          make -C .testing -j build/deps/lib/libFMS.a
+          make -C .testing -j PKG= build/deps/lib/libgsw.a
+          make -C .testing -j PKG= build/deps/lib/libcvmix.a
 
       - name: Compile MOM6 supporting OpenMP
         run: make -C .testing -j build/openmp/MOM6
 
       - name: Prepare artifact
         run: tar -cf mom6-openmp.tar .testing/build/openmp/MOM6
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: mom6-openmp-artifact
           path: mom6-openmp.tar
@@ -120,13 +124,11 @@ jobs:
     runs-on: macOS-latest
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup/
 
-      - name: Compile target FMS
+      - name: Compile target dependencies
         run: |
           make -C .testing \
           DO_REGRESSION_TESTS=1 \
@@ -143,7 +145,7 @@ jobs:
       - name: Prepare artifact
         run: tar -cf mom6-target.tar .testing/build/target/MOM6
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: mom6-target-artifact
           path: mom6-target.tar
@@ -158,19 +160,17 @@ jobs:
       - build-asymmetric
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup
 
       - name: Download symmetric MOM6
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-symmetric-artifact
 
       - name: Download asymmetric MOM6
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-asymmetric-artifact
 
@@ -191,14 +191,12 @@ jobs:
     needs: build-symmetric
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-symmetric-artifact
 
@@ -216,14 +214,12 @@ jobs:
     needs: build-symmetric
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-symmetric-artifact
 
@@ -241,14 +237,12 @@ jobs:
     needs: build-symmetric
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-symmetric-artifact
 
@@ -266,14 +260,12 @@ jobs:
     needs: build-symmetric
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-symmetric-artifact
 
@@ -301,14 +293,12 @@ jobs:
           - {id: r, desc: "density"}
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup
 
       - name: Download symmetric MOM6
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-symmetric-artifact
 
@@ -328,19 +318,17 @@ jobs:
       - build-openmp
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup
 
       - name: Download symmetric MOM6
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-symmetric-artifact
 
       - name: Download OpenMP MOM6
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-openmp-artifact
 
@@ -363,19 +351,17 @@ jobs:
       - build-repro
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup
 
       - name: Download DEBUG MOM6
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-symmetric-artifact
 
       - name: Download REPRO MOM6
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-repro-artifact
 
@@ -399,19 +385,17 @@ jobs:
       - build-target
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v7
 
       - uses: ./.github/actions/macos-setup
 
       - name: Download symmetric MOM6
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-symmetric-artifact
 
       - name: Download target MOM6
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: mom6-target-artifact
 
@@ -440,7 +424,7 @@ jobs:
       - test-repro
 
     steps:
-      - uses: geekyeggo/delete-artifact@v5
+      - uses: geekyeggo/delete-artifact@v6
         with:
           name: |
             mom6-asymmetric-artifact
@@ -467,7 +451,7 @@ jobs:
       - test-repro
 
     steps:
-      - uses: geekyeggo/delete-artifact@v5
+      - uses: geekyeggo/delete-artifact@v6
         with:
           name: |
             mom6-symmetric-artifact
@@ -490,7 +474,7 @@ jobs:
       - test-regression
 
     steps:
-      - uses: geekyeggo/delete-artifact@v5
+      - uses: geekyeggo/delete-artifact@v6
         with:
           name: |
             mom6-symmetric-artifact

.gitignore

@@ -1,23 +1 @@
-# Ignore vim and emacs files
-*.swp
-*~
-html
-
-
-# Build output
-*.o
-*.mod
-MOM6
-build/
-deps/
-pkg/MARBL
-
-
-# Autoconf output
-aclocal.m4
-autom4te.cache/
-config.log
-config.status
-configure
-/Makefile
-Makefile.mkmf
+/configure

.gitlab/pipeline-ci-tool.sh

@@ -164,7 +164,14 @@ nolibs-ocean-ice-compile () {
     mkdir -p build-ocean-ice-nolibs-$1
     cd build-ocean-ice-nolibs-$1
     make -f ../tools/MRS/Makefile.build ./$1/env BUILD=. ENVIRON=../../environ -s
-    ../src/mkmf/bin/list_paths -l ../src/MOM6/config_src/{drivers/FMS_cap,memory/dynamic_symmetric,infra/FMS1,ext*} ../src/MOM6/src ../src/SIS2/*src ../src/icebergs/src ../src/{FMS1,coupler,ice_param,land_null,atmos_null}
+    ../src/mkmf/bin/list_paths -l \
+      ../src/MOM6/config_src/{drivers/FMS_cap,memory/dynamic_symmetric,infra/FMS1,ext*} \
+      ../src/MOM6/src \
+      ../src/SIS2/src \
+      ../src/SIS2/config_src/dynamic_symmetric \
+      ../src/SIS2/config_src/external/Icepack_interfaces \
+      ../src/icebergs/src \
+      ../src/{FMS1,coupler,ice_param,land_null,atmos_null}
     sed -i '/FMS1\/.*\/test_/d' path_names
     ../src/mkmf/bin/mkmf -t ../src/mkmf/templates/ncrc5-$1.mk -p MOM6 -c"-Duse_libMPI -Duse_netCDF -D_USE_LEGACY_LAND_ -Duse_AM3_physics" path_names
     (source $1/env ; make NETCDF=3 REPRO=1 MOM6 -s -j)