Merge branch 'dev/gfdl' into ac_makedep_unicode

NOAA-GFDL · Jun 9, 2023 · a280a04 · a280a04
2 parents 761d781 + e45b983
commit a280a04
Show file tree

Hide file tree

Showing 30 changed files with 1,972 additions and 1,077 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ before_script:
 p:merge:
   stage: setup
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - git pull --no-edit https://github.com/NOAA-GFDL/MOM6.git dev/gfdl
 
@@ -31,7 +31,7 @@ p:merge:
 p:clone:
   stage: setup
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh create-job-dir
 #.gitlab/pipeline-ci-tool.sh clean-job-dir
@@ -44,31 +44,31 @@ p:clone:
 s:work-space:pgi:
   stage: setup
   tags:
-    - ncrc4
+    - ncrc5
   needs: ["p:clone"]
   script:
     - .gitlab/pipeline-ci-tool.sh copy-test-space pgi
 
 s:work-space:intel:
   stage: setup
   tags:
-    - ncrc4
+    - ncrc5
   needs: ["p:clone"]
   script:
     - .gitlab/pipeline-ci-tool.sh copy-test-space intel
 
 s:work-space:gnu:
   stage: setup
   tags:
-    - ncrc4
+    - ncrc5
   needs: ["p:clone"]
   script:
     - .gitlab/pipeline-ci-tool.sh copy-test-space gnu
 
 s:work-space:gnu-restarts:
   stage: setup
   tags:
-    - ncrc4
+    - ncrc5
   needs: ["p:clone"]
   script:
     - .gitlab/pipeline-ci-tool.sh copy-test-space gnu-rst
@@ -82,47 +82,47 @@ compile:pgi:repro:
   stage: builds
   needs: ["p:clone"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh mrs-compile repro_pgi
 
 compile:intel:repro:
   stage: builds
   needs: ["p:clone"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh mrs-compile repro_intel
 
 compile:gnu:repro:
   stage: builds
   needs: ["p:clone"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh mrs-compile repro_gnu mrs-compile static_gnu
 
 compile:gnu:debug:
   stage: builds
   needs: ["p:clone"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh mrs-compile debug_gnu
 
 compile:gnu:ocean-only-nolibs:
   stage: builds
   needs: ["p:clone"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh nolibs-ocean-only-compile gnu
 
 compile:gnu:ice-ocean-nolibs:
   stage: builds
   needs: ["p:clone"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh nolibs-ocean-ice-compile gnu
 
@@ -132,36 +132,36 @@ run:pgi:
   stage: run
   needs: ["s:work-space:pgi","compile:pgi:repro"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
-    - sbatch --clusters=c3,c4 --nodes=30 --time=1:00:00 --account=gfdl_o --qos=debug --job-name=mom6_pgi_tests --output=log.$CI_JOB_ID --wait .gitlab/pipeline-ci-tool.sh run-suite pgi SNL && ( egrep -v 'pagefaults|HiWaterMark=' log.$CI_JOB_ID ; echo Job returned normally ) || ( cat log.$CI_JOB_ID ; echo Job failed ; exit 911 )
+    - sbatch --clusters=c5 --nodes=12 --time=15:00 --account=gfdl_o --qos=debug --job-name=mom6_pgi_tests --output=log.$CI_JOB_ID --wait .gitlab/pipeline-ci-tool.sh run-suite pgi SNL && ( egrep -v 'pagefaults|HiWaterMark=' log.$CI_JOB_ID ; echo Job returned normally ) || ( cat log.$CI_JOB_ID ; echo Job failed ; exit 911 )
     - test -f $JOB_DIR/CI-BATCH-SUCCESS-pgi-SNL || ( echo Batch job did not complete ; exit 911 )
 
 run:intel:
   stage: run
   needs: ["s:work-space:intel","compile:intel:repro"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
-    - sbatch --clusters=c3,c4 --nodes=30 --time=1:00:00 --account=gfdl_o --qos=debug --job-name=mom6_intel_tests --output=log.$CI_JOB_ID --wait .gitlab/pipeline-ci-tool.sh run-suite intel SNL && ( egrep -v 'pagefaults|HiWaterMark=' log.$CI_JOB_ID ; echo Job returned normally ) || ( cat log.$CI_JOB_ID ; echo Job failed ; exit 911 )
+    - sbatch --clusters=c5 --nodes=12 --time=15:00 --account=gfdl_o --qos=debug --job-name=mom6_intel_tests --output=log.$CI_JOB_ID --wait .gitlab/pipeline-ci-tool.sh run-suite intel SNL && ( egrep -v 'pagefaults|HiWaterMark=' log.$CI_JOB_ID ; echo Job returned normally ) || ( cat log.$CI_JOB_ID ; echo Job failed ; exit 911 )
     - test -f $JOB_DIR/CI-BATCH-SUCCESS-intel-SNL || ( echo Batch job did not complete ; exit 911 )
 
 run:gnu:
   stage: run
   needs: ["s:work-space:gnu","compile:gnu:repro","compile:gnu:debug"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
-    - sbatch --clusters=c3,c4 --nodes=30 --time=1:00:00 --account=gfdl_o --qos=debug --job-name=mom6_gnu_tests --output=log.$CI_JOB_ID --wait .gitlab/pipeline-ci-tool.sh run-suite gnu SNLDT && ( egrep -v 'pagefaults|HiWaterMark=' log.$CI_JOB_ID ; echo Job returned normally ) || ( cat log.$CI_JOB_ID ; echo Job failed ; exit 911 )
+    - sbatch --clusters=c5 --nodes=12 --time=15:00 --account=gfdl_o --qos=debug --job-name=mom6_gnu_tests --output=log.$CI_JOB_ID --wait .gitlab/pipeline-ci-tool.sh run-suite gnu SNLDT && ( egrep -v 'pagefaults|HiWaterMark=' log.$CI_JOB_ID ; echo Job returned normally ) || ( cat log.$CI_JOB_ID ; echo Job failed ; exit 911 )
     - test -f $JOB_DIR/CI-BATCH-SUCCESS-gnu-SNLDT || ( echo Batch job did not complete ; exit 911 )
 
 run:gnu-restarts:
   stage: run
   needs: ["s:work-space:gnu-restarts","compile:gnu:repro"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
-    - sbatch --clusters=c3,c4 --nodes=30 --time=1:00:00 --account=gfdl_o --qos=debug --job-name=mom6_gnu_restarts --output=log.$CI_JOB_ID --wait .gitlab/pipeline-ci-tool.sh run-suite gnu R && ( egrep -v 'pagefaults|HiWaterMark=' log.$CI_JOB_ID ; echo Job returned normally ) || ( cat log.$CI_JOB_ID ; echo Job failed ; exit 911 )
+    - sbatch --clusters=c5 --nodes=12 --time=15:00 --account=gfdl_o --qos=debug --job-name=mom6_gnu_restarts --output=log.$CI_JOB_ID --wait .gitlab/pipeline-ci-tool.sh run-suite gnu R && ( egrep -v 'pagefaults|HiWaterMark=' log.$CI_JOB_ID ; echo Job returned normally ) || ( cat log.$CI_JOB_ID ; echo Job failed ; exit 911 )
     - test -f $JOB_DIR/CI-BATCH-SUCCESS-gnu-R || ( echo Batch job did not complete ; exit 911 )
 
 # GH/autoconf tests (duplicates the GH actions tests)
@@ -173,40 +173,40 @@ actions:gnu:
   stage: tests
   needs: []
   tags:
-    - ncrc4
+    - ncrc5
   before_script:
     - echo -e "\e[0Ksection_start:`date +%s`:submodules[collapsed=true]\r\e[0KCloning submodules"
     - git submodule init ; git submodule update
     - echo -e "\e[0Ksection_end:`date +%s`:submodules\r\e[0K"
   script:
     - echo -e "\e[0Ksection_start:`date +%s`:compile[collapsed=true]\r\e[0KCompiling executables"
     - cd .testing
-    - module unload PrgEnv-pgi PrgEnv-intel PrgEnv-gnu darshan ; module load PrgEnv-gnu ; module unload netcdf gcc ; module load gcc/7.3.0 cray-hdf5 cray-netcdf
+    - module unload PrgEnv-gnu PrgEnv-intel PrgEnv-nvhpc ; module load PrgEnv-gnu ; module unload gcc ; module load gcc/12.2.0 cray-hdf5 cray-netcdf
     - make -s -j
     - MPIRUN= make preproc -s -j
     - echo -e "\e[0Ksection_end:`date +%s`:compile\r\e[0K"
     - (echo '#!/bin/bash';echo 'make MPIRUN="srun -mblock --exclusive" WORKSPACE=$WORKSPACE test -s -j') > job.sh
-    - sbatch --clusters=c3,c4 --nodes=5 --time=0:05:00 --account=gfdl_o --qos=debug --job-name=MOM6.gnu.testing --output=log.$CI_JOB_ID --wait job.sh || ( cat log.$CI_JOB_ID ; exit 911 ) && make WORKSPACE=$WORKSPACE test -s
+    - sbatch --clusters=c5 --nodes=2 --time=0:10:00 --account=gfdl_o --qos=debug --job-name=MOM6.gnu.testing --output=log.$CI_JOB_ID --wait job.sh || ( cat log.$CI_JOB_ID ; exit 911 ) && make WORKSPACE=$WORKSPACE test -s
     - make WORKSPACE=$WORKSPACE test.summary
 
 actions:intel:
   stage: tests
   needs: []
   tags:
-    - ncrc4
+    - ncrc5
   before_script:
     - echo -e "\e[0Ksection_start:`date +%s`:submodules[collapsed=true]\r\e[0KCloning submodules"
     - git submodule init ; git submodule update
     - echo -e "\e[0Ksection_end:`date +%s`:submodules\r\e[0K"
   script:
     - echo -e "\e[0Ksection_start:`date +%s`:compile[collapsed=true]\r\e[0KCompiling executables"
     - cd .testing
-    - module unload PrgEnv-pgi PrgEnv-intel PrgEnv-gnu darshan; module load PrgEnv-intel; module unload netcdf intel; module load intel/18.0.6.288 cray-hdf5 cray-netcdf
+    - module unload PrgEnv-pgi PrgEnv-intel PrgEnv-gnu ; module load PrgEnv-intel; module unload intel; module load intel-classic/2022.0.2 cray-hdf5 cray-netcdf
     - make -s -j
     - MPIRUN= make preproc -s -j
     - echo -e "\e[0Ksection_end:`date +%s`:compile\r\e[0K"
     - (echo '#!/bin/bash';echo 'make MPIRUN="srun -mblock --exclusive" WORKSPACE=$WORKSPACE test -s -j') > job.sh
-    - sbatch --clusters=c3,c4 --nodes=5 --time=0:05:00 --account=gfdl_o --qos=debug --job-name=MOM6.intel.testing --output=log.$CI_JOB_ID --wait job.sh || ( cat log.$CI_JOB_ID ; exit 911 ) && make WORKSPACE=$WORKSPACE test -s
+    - sbatch --clusters=c5 --nodes=2 --time=0:10:00 --account=gfdl_o --qos=debug --job-name=MOM6.intel.testing --output=log.$CI_JOB_ID --wait job.sh || ( cat log.$CI_JOB_ID ; exit 911 ) && make WORKSPACE=$WORKSPACE test -s
     - make WORKSPACE=$WORKSPACE test.summary
 
 # Tests
@@ -218,31 +218,31 @@ t:pgi:symmetric:
   stage: tests
   needs: ["run:pgi"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats pgi S
 
 t:pgi:non-symmetric:
   stage: tests
   needs: ["run:pgi"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats pgi N
 
 t:pgi:layout:
   stage: tests
   needs: ["run:pgi"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats pgi L
 
 t:pgi:params:
   stage: tests
   needs: ["run:pgi"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-params pgi
   allow_failure: true
@@ -251,31 +251,31 @@ t:intel:symmetric:
   stage: tests
   needs: ["run:intel"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats intel S
 
 t:intel:non-symmetric:
   stage: tests
   needs: ["run:intel"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats intel N
 
 t:intel:layout:
   stage: tests
   needs: ["run:intel"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats intel L
 
 t:intel:params:
   stage: tests
   needs: ["run:intel"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-params intel
   allow_failure: true
@@ -284,55 +284,55 @@ t:gnu:symmetric:
   stage: tests
   needs: ["run:gnu"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats gnu S
 
 t:gnu:non-symmetric:
   stage: tests
   needs: ["run:gnu"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats gnu N
 
 t:gnu:layout:
   stage: tests
   needs: ["run:gnu"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats gnu L
 
 t:gnu:static:
   stage: tests
   needs: ["run:gnu"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats gnu T
 
 t:gnu:symmetric-debug:
   stage: tests
   needs: ["run:gnu"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats gnu D
 
 t:gnu:restart:
   stage: tests
   needs: ["run:gnu-restarts"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-stats gnu R
 
 t:gnu:params:
   stage: tests
   needs: ["run:gnu"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-params gnu
   allow_failure: true
@@ -341,7 +341,7 @@ t:gnu:diags:
   stage: tests
   needs: ["run:gnu"]
   tags:
-    - ncrc4
+    - ncrc5
   script:
     - .gitlab/pipeline-ci-tool.sh check-diags gnu
   allow_failure: true
@@ -350,7 +350,7 @@ t:gnu:diags:
 cleanup:
   stage: cleanup
   tags:
-    - ncrc4
+    - ncrc5
   before_script:
     - echo Skipping usual preamble
   script: