Merge pull request #3 from NCAR/dev/ncar

sync with NCAR fork
NOAA-GFDL · Jul 25, 2018 · 4e41df9 · 4e41df9
2 parents eadf2f2 + 02d9be2
commit 4e41df9
Show file tree

Hide file tree

Showing 194 changed files with 25,910 additions and 19,008 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -34,10 +34,12 @@ setup:
     - git clone https://github.com/adcroft/MRS.git MRS
     # 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 +53,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_ocean_extras,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 +116,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:24: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 +221,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:

diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,9 @@
 [submodule "pkg/GSW-Fortran"]
 	path = pkg/GSW-Fortran
 	url = https://github.com/TEOS-10/GSW-Fortran.git
+[submodule "pkg/MOM6_DA_hooks"]
+	path = pkg/MOM6_DA_hooks
+	url = https://github.com/MJHarrison-GFDL/MOM6_DA_hooks.git
+[submodule "pkg/geoKdTree"]
+	path = pkg/geoKdTree
+	url = https://github.com/travissluka/geoKdTree.git
diff --git a/config_src/coupled_driver/MOM_surface_forcing.F90 b/config_src/coupled_driver/MOM_surface_forcing.F90
diff --git a/config_src/coupled_driver/ocean_model_MOM.F90 b/config_src/coupled_driver/ocean_model_MOM.F90
diff --git a/config_src/ice_solo_driver/atmos_ocean_fluxes.F90 b/config_src/ice_solo_driver/atmos_ocean_fluxes.F90
@@ -10,21 +10,23 @@ module atmos_ocean_fluxes_mod
 
 contains
 
+!> This subroutine duplicates an interface used by the FMS coupler, but only
+!! returns a value of -1.  None of the arguments are used for anything.
 function aof_set_coupler_flux(name, flux_type, implementation, atm_tr_index,     &
                               param, flag, ice_restart_file, ocean_restart_file, &
                               units, caller, verbosity)  result (coupler_index)
 
-  character(len=*), intent(in)                          :: name
-  character(len=*), intent(in)                          :: flux_type
-  character(len=*), intent(in)                          :: implementation
-  integer,          intent(in), optional                :: atm_tr_index
-  real,             intent(in), dimension(:), optional  :: param
-  logical,          intent(in), dimension(:), optional  :: flag
-  character(len=*), intent(in), optional                :: ice_restart_file
-  character(len=*), intent(in), optional                :: ocean_restart_file
-  character(len=*), intent(in), optional                :: units
-  character(len=*), intent(in), optional                :: caller
-  integer,          intent(in), optional                :: verbosity
+  character(len=*),                intent(in) :: name !< An unused argument
+  character(len=*),                intent(in) :: flux_type !< An unused argument
+  character(len=*),                intent(in) :: implementation !< An unused argument
+  integer,               optional, intent(in) :: atm_tr_index !< An unused argument
+  real,    dimension(:), optional, intent(in) :: param !< An unused argument
+  logical, dimension(:), optional, intent(in) :: flag !< An unused argument
+  character(len=*),      optional, intent(in) :: ice_restart_file !< An unused argument
+  character(len=*),      optional, intent(in) :: ocean_restart_file !< An unused argument
+  character(len=*),      optional, intent(in) :: units !< An unused argument
+  character(len=*),      optional, intent(in) :: caller !< An unused argument
+  integer,               optional, intent(in) :: verbosity !< An unused argument
 
   ! None of these arguments are used for anything.