Merge pull request NOAA-EMC#17 from NOAA-GFDL/dev/gfdl

Merge in dev/gfdl updates
jiandewang · May 9, 2019 · 139ab1f · 139ab1f
2 parents a0c80dc + 1733957
commit 139ab1f
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 7,036 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -32,9 +32,9 @@ 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 9badc63acefbf038)
+    - (cd MRS ; git checkout xanadu-fms)
     # Update MOM6-examples and submodules
-    - (cd MOM6-examples && git checkout . && git checkout dev/gfdl && git pull && git checkout cf73a9ad63f8ccf7 && git submodule init && git submodule update)
+    - (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

diff --git a/.testing/Makefile b/.testing/Makefile
@@ -18,7 +18,7 @@ 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/ensemble_manager.F90,axis_utils,horiz_interp,time_interp,astronomy,mosaic,random_numbers
+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
 

diff --git a/config_src/coupled_driver/coupler_util.F90 b/config_src/coupled_driver/coupler_util.F90