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

Merge in latest dev/gfdl updates
jiandewang · Apr 15, 2019 · f5bc54b · f5bc54b
2 parents 6ffc897 + 317f91b
commit f5bc54b
Show file tree

Hide file tree

Showing 44 changed files with 6,894 additions and 282 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,14 +4,13 @@
 # This is a not a c-language project but we use the same environment.
 language: c
 dist: trusty
-sudo: false
 
 addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
     packages:
-    - tcsh pkg-config netcdf-bin libnetcdf-dev openmpi-bin libopenmpi-dev gfortran
+    - tcsh pkg-config netcdf-bin libnetcdf-dev mpich2 libmpich2-dev gfortran
 
 # For saving time...
 cache:

diff --git a/config_src/nuopc_driver/MOM_ocean_model.F90 b/config_src/nuopc_driver/MOM_ocean_model.F90
diff --git a/config_src/nuopc_driver/MOM_surface_forcing.F90 b/config_src/nuopc_driver/MOM_surface_forcing.F90
diff --git a/config_src/nuopc_driver/mom_cap.F90 b/config_src/nuopc_driver/mom_cap.F90