Merge branch 'master' of https://github.com/EDmodel/ED2 into Forestry_Testing

Author: crollinson

.travis.yml

@@ -1,14 +1,20 @@
 language: c
-sudo: required
+dist: xenial
+
+addons:
+  apt:
+    packages:
+      - gfortran
+      - libopenmpi-dev
+      - libhdf5-openmpi-dev
 
 before_install:
-    - sudo apt-get clean && sudo apt-get update
-    - sudo apt-get install gcc gfortran hdf5-tools libopenmpi-dev libhdf5-openmpi-dev 
     - which gfortran
+    - gfortran --version
     - which gcc
-    - which h5dump
+    - gcc --version
 
 script:
-    - pwd
+    - set -e
     - cd ED/build/
     - ./install.sh -k C -p travisci -g

ED/build/make/include.mk.travisci

@@ -24,7 +24,7 @@ BASE=$(ED_ROOT)/build/
 # still be able to compile without HDF5 but the code is not going to run.                  #
 #------------------------------------------------------------------------------------------#
 USE_HDF5=1
-HDF5_HOME=/usr
+HDF5_HOME=/usr/lib/x86_64-linux-gnu/hdf5/openmpi
 HDF5_INCS=-I$(HDF5_HOME)/include
 HDF5_LIBS=-lz -L$(HDF5_HOME)/lib -lhdf5 -lhdf5_fortran -lhdf5_hl
 #------------------------------------------------------------------------------------------#