dry run

.gitlab-ci.yml

@@ -8,7 +8,7 @@ stages:
 # Merges MOM6 with dev/gfdl. Changes directory to test directory, if it exists.
 before_script:
   - MOM6_SRC=$CI_PROJECT_DIR
-  - CACHE_DIR=/lustre/f1/oar.gfdl.ogrp-account/runner/cache/
+  - echo Cache directory set to ${CACHE_DIR:=/lustre/f2/scratch/oar.gfdl.ogrp-account/runner/cache/}
   - git pull --no-edit https://github.com/NOAA-GFDL/MOM6.git dev/gfdl && git submodule init && git submodule update
   - pwd ; ls
 
@@ -32,12 +32,15 @@ setup:
     - git clone --recursive http://gitlab.gfdl.noaa.gov/ogrp/Gaea-stats-MOM6-examples.git tests && cd tests
     # Install / update testing scripts
     - git clone https://github.com/adcroft/MRS.git MRS
+    - (cd MRS ; git checkout xanadu-fms)
     # Update MOM6-examples and submodules
     - (cd MOM6-examples && git checkout . && git checkout dev/gfdl && git pull && git submodule init && git submodule update)
+    - (cd MOM6-examples/src/MOM6 && git submodule update)
     - test -d MOM6-examples/src/LM3 || make -f MRS/Makefile.clone clone_gfdl -s
     - make -f MRS/Makefile.clone MOM6-examples/.datasets -s
     #- (cd MOM6-examples/src/mkmf && git pull https://github.com/adcroft/mkmf.git add_coverage_mode)
     - env > gitlab_session.log
+    # Cache everything under tests to unpack for each subsequent stage
     - cd ../ ; time tar zcf $CACHE_DIR/tests_$CI_PIPELINE_ID.tgz tests
 
 # Compiles
@@ -51,6 +54,30 @@ gnu:repro:
     - time make -f MRS/Makefile.build MOM6_SRC=../ static_gnu -s -j
     - time tar zvcf $CACHE_DIR/build-gnu-repro-$CI_PIPELINE_ID.tgz `find build/gnu -name MOM6`
 
+gnu:ocean-only-nolibs:
+  stage: builds
+  tags:
+    - ncrc4
+  script:
+    - time tar zxf $CACHE_DIR/tests_$CI_PIPELINE_ID.tgz && cd tests
+    - make -f MRS/Makefile.build build/gnu/env && cd build/gnu
+    # mkdir -p build/gnu/repro/symmetric_dynamic/ocean_only && cd build/gnu/repro/symmetric_dynamic/ocean_only
+    - ../../MOM6-examples/src/mkmf/bin/list_paths -l ../../../config_src/{solo_driver,dynamic_symmetric} ../../../src ../../MOM6-examples/src/FMS
+    - ../../MOM6-examples/src/mkmf/bin/mkmf -t ../../MOM6-examples/src/mkmf/templates/ncrc-gnu.mk -p MOM6 -c"-Duse_libMPI -Duse_netCDF" path_names
+    - time (source ./env ; make NETCDF=3 REPRO=1 MOM6 -s -j)
+
+gnu:ice-ocean-nolibs:
+  stage: builds
+  tags:
+    - ncrc4
+  script:
+    - time tar zxf $CACHE_DIR/tests_$CI_PIPELINE_ID.tgz && cd tests
+    - make -f MRS/Makefile.build build/gnu/env && cd build/gnu
+    # mkdir -p build/gnu/repro/symmetric_dynamic/ocean_only && cd build/gnu/repro/symmetric_dynamic/ocean_only
+    - ../../MOM6-examples/src/mkmf/bin/list_paths -l ../../../config_src/{coupled_driver,dynamic} ../../../src ../../MOM6-examples/src/{FMS,coupler,SIS2,icebergs,ice_param,land_null,atmos_null}
+    - ../../MOM6-examples/src/mkmf/bin/mkmf -t ../../MOM6-examples/src/mkmf/templates/ncrc-gnu.mk -p MOM6 -c"-Duse_libMPI -Duse_netCDF -D_USE_LEGACY_LAND_ -Duse_AM3_physics" path_names
+    - time (source ./env ; make NETCDF=3 REPRO=1 MOM6 -s -j)
+
 intel:repro:
   stage: builds
   tags:
@@ -90,8 +117,9 @@ run:
     - time tar zxf $CACHE_DIR/build-pgi-repro-$CI_PIPELINE_ID.tgz
     # time tar zxf $CACHE_DIR/build-gnu-debug-$CI_PIPELINE_ID.tgz
     - echo "make -f MRS/Makefile.tests all -B" > job.sh
-    - msub -l partition=c4,nodes=29,walltime=00:29:00,qos=norm -q debug -S /bin/tcsh -j oe -A gfdl_o -z -o log.$CI_PIPELINE_ID -N mom6_regression -K job.sh
+    - msub -l partition=c4,nodes=29,walltime=00:31:00,qos=norm -q debug -S /bin/tcsh -j oe -A gfdl_o -z -o log.$CI_PIPELINE_ID -N mom6_regression -K job.sh
     - cat log.$CI_PIPELINE_ID
+    - test -f restart_results_gnu.tar.gz
     - time tar zvcf $CACHE_DIR/results-$CI_PIPELINE_ID.tgz *.tar.gz
 
 # Tests
@@ -194,6 +222,16 @@ gnu:restart:
     - time tar zxf $CACHE_DIR/results-$CI_PIPELINE_ID.tgz
     - make -f MRS/Makefile.tests gnu_check_restarts
 
+gnu:params:
+  stage: tests
+  tags:
+    - ncrc4
+  script:
+    - time tar zxf $CACHE_DIR/tests_$CI_PIPELINE_ID.tgz && cd tests
+    - time tar zxf $CACHE_DIR/results-$CI_PIPELINE_ID.tgz
+    - make -f MRS/Makefile.tests params_gnu_symmetric
+  allow_failure: true
+
 cleanup:
   stage: cleanup
   tags:

.testing/Makefile

@@ -0,0 +1,77 @@
+# Makefile steps to run on Travis-CI
+# e.g. make MEMORY_SHAPE=dynamic_symmetric REPRO=1 OPENMP=1
+
+# Versions to use
+FMS_COMMIT ?= xanadu
+MKMF_COMMIT ?= master
+
+# Where to clone from
+FMS_URL ?= https://github.com/NOAA-GFDL/FMS.git
+MKMF_URL ?= https://github.com/NOAA-GFDL/mkmf.git
+CONFIGS_URL ?= https://github.com/NOAA-GFDL/MOM6-examples.git
+REGRESSIONS_URL ?= https://github.com/adcroft/Gaea-stats-MOM6-examples
+
+# Experiments to run
+ifeq ($(MEMORY_SHAPE),"dynamic_symmetric")
+EXPERIMENTS ?= unit_tests double_gyre flow_downslope/z CVmix_SCM_tests/cooling_only/EPBL circle_obcs
+else
+EXPERIMENTS ?= unit_tests double_gyre flow_downslope/z CVmix_SCM_tests/cooling_only/EPBL
+endif
+
+FMS_PACKAGES ?= platform,include,memutils,constants,mpp,fms,time_manager,diag_manager,data_override,coupler/coupler_types.F90,coupler/ensemble_manager.F90,axis_utils,horiz_interp,time_interp,astronomy,mosaic,random_numbers
+TEMPLATE ?= .testing/linux-ubuntu-xenial-gnu.mk
+MPIRUN ?= mpirun
+
+# MEMORY_SHAPE must be defined for this Makefile to work
+MEMORY_SHAPE ?= dynamic_symmetric
+
+# Everything above is above is "configurable" with environment variables
+SHELL = bash
+
+# Path where executable will be built
+BUILD_PATH = build
+###/$(MEMORY_SHAPE)-$(EXEC_MODE)
+# Root of configurations (MOM6-examples)
+EXPERIMENTS_ROOT = experiments
+# Regression results
+REGRESSIONS_ROOT = answers
+
+.PRECIOUS: %/ocean.stats
+
+run: $(foreach e,$(EXPERIMENTS),$(EXPERIMENTS_ROOT)/ocean_only/$(e)/ocean.stats)
+
+test: $(foreach e,$(EXPERIMENTS),$(REGRESSIONS_ROOT)/regressions/ocean_only/$(e)/ocean.stats.gnu)
+
+compile: $(BUILD_PATH)/MOM6
+
+$(BUILD_PATH)/MOM6: FMS mkmf
+	mkdir -p $(@D)
+	cd $(@D); \
+	../mkmf/bin/list_paths -l ../FMS/{$(FMS_PACKAGES)} ../config_src/{$(MEMORY_SHAPE),solo_driver} ../src \
+	&& ../mkmf/bin/mkmf -t ../$(TEMPLATE) -c '-Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -DMAXFIELDMETHODS_=500' -p $(@F) path_names \
+	&& make -j NETCDF=3 $(@F)
+
+$(EXPERIMENTS_ROOT)/%/ocean.stats: $(EXPERIMENTS_ROOT)
+	mkdir -p $(@D)/RESTART
+	cd $(@D) ; $(MPIRUN) -n 1 $(PWD)/$(BUILD_PATH)/MOM6
+
+$(REGRESSIONS_ROOT)/regressions/%/ocean.stats.gnu: $(EXPERIMENTS_ROOT)/%/ocean.stats $(REGRESSIONS_ROOT)
+	cp $< $@
+	cd $(@D) ; git status --porcelain $(@F)
+
+# Targets to clone repositories needed to build
+FMS:
+	git clone -q $(FMS_URL)
+	cd $@ ; git checkout -q $(FMS_COMMIT)
+
+mkmf:
+	git clone -q $(MKMF_URL)
+	cd $@ ; git checkout -q $(MKMF_COMMIT)
+
+$(EXPERIMENTS_ROOT):
+	mkdir -p $(@D)
+	cd $(@D) ; git clone --depth 1 $(CONFIGS_URL) experiments
+
+$(REGRESSIONS_ROOT):
+	mkdir -p $(@D)
+	cd $(@D) ; git clone --depth 1 $(REGRESSIONS_URL) answers

.testing/README.md

@@ -0,0 +1,3 @@
+# .testing
+
+This directory contains scripts used when evaluating commits on Travis-CI

.testing/configure

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+echo "Configured!" $MAKEARGS
+touch build/test_${MAKEARGS//\ /_}