Merge remote-tracking branch 'gfdl/dev/master' into zero_accel

mom-ocean · May 18, 2017 · bce5cad · bce5cad
2 parents 01af8b7 + 92aba2f
commit bce5cad
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,41 @@
+# Clones MOM6-examples, if necessary, and pulls latest of everything
+before_script:
+  - git submodule init && git submodule update
+  - test -d MOM6-examples || (git clone --recursive https://github.com/NOAA-GFDL/MOM6-examples.git)
+  - (cd MOM6-examples && git checkout . && git checkout dev/master && git pull && git submodule init && git submodule update)
+  - bash MOM6-examples/tools/tests/GFDL-Gitlab-MOM6/before_script.sh
+
+# Cleans up model output and restores experiment directories
+after_script:
+  - (cd MOM6-examples && rm -rf ocean_only ice_ocean_SIS ice_ocean_SIS2 land_ice_ocean_LM3_SIS2 coupled_AM2_LM3_SIS coupled_AM2_LM3_SIS2 && git checkout -q .)
+
+cache:
+  paths:
+    - MOM6-examples
+    - build
+
+# Compiles
+c3:build:
+  stage: build
+  tags:
+    - ncrc3
+  script:
+    - (cd MOM6-examples/src/mkmf && git pull https://github.com/adcroft/mkmf.git add_coverage_mode)
+    - make -f MOM6-examples/tools/tests/GFDL-Gitlab-MOM6/Makefile.build build_gnu build_intel build_pgi MOM6_SRC=. -s -j
+    - make -f MOM6-examples/tools/tests/GFDL-Gitlab-MOM6/Makefile.build static_gnu static_intel debug_gnu coverage_gnu debug_intel MOM6_SRC=. -s -j
+
+# Runs
+c3:regression:
+  stage: test
+  tags:
+    - ncrc3
+  script:
+    - md5sum `find MOM6-examples -name ocean.stats.gnu -o -name ocean.stats.intel -o -name ocean.stats.pgi` > all.md5
+    - md5sum `find MOM6-examples/ocean_only -type d -exec bash -c '[ -f "$0"/MOM_memory.h ] && [ -f "$0"/ocean.stats.gnu ]' '{}' \; -printf '%p/ocean.stats.gnu\n%p/ocean.stats.intel\n%p/ocean.stats.pgi\n'` > static.md5
+    - bash MOM6-examples/tools/tests/GFDL-Gitlab-MOM6/run_stage.sh
+    - echo "Regression results for non-symmetric executables"
+    - tar xf non_symmetric.tar && md5sum -c all.md5
+    - echo "Regression results for symmetric executables"
+    - tar xf symmetric.tar && md5sum -c all.md5
+    - echo "Regression results for static executables"
+    - tar xf static.tar && md5sum -c all.md5
diff --git a/src/framework/MOM_domains.F90 b/src/framework/MOM_domains.F90
@@ -993,7 +993,7 @@ subroutine MOM_domains_init(MOM_dom, param_file, symmetric, static_memory, &
                             NIHALO, NJHALO, NIGLOBAL, NJGLOBAL, NIPROC, NJPROC, &
                             min_halo, domain_name, include_name, param_suffix)
   type(MOM_domain_type),           pointer       :: MOM_dom
-  type(param_file_type),           intent(in)    :: param_file
+  type(param_file_type),           intent(in)    :: param_file !< A structure to parse for run-time parameters
   logical, optional,               intent(in)    :: symmetric
   logical, optional,               intent(in)    :: static_memory
   integer, optional,               intent(in)    :: NIHALO, NJHALO
@@ -1152,8 +1152,7 @@ subroutine MOM_domains_init(MOM_dom, param_file, symmetric, static_memory, &
   call get_param(param_file, mdl, "THIN_HALO_UPDATES", MOM_dom%thin_halo_updates, &
                  "If true, optional arguments may be used to specify the \n"//&
                  "The width of the halos that are updated with each call.", &
-                 default=.false., layoutParam=.true.)
-            !### THIS DEFAULT SHOULD BE CHANGED TO TRUE ONCE FMS IS FIXED. -RWH
+                 default=.true., layoutParam=.true.)
 
   nihalo_dflt = 4 ; njhalo_dflt = 4
   if (present(NIHALO)) nihalo_dflt = NIHALO