Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/jenkins/macosx_pine-island_dakota

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/jenkins/macosx_pine-island_dakota (modified) (3 diffs)

issm/branches/trunk-larour-NatGeoScience2016/jenkins/macosx_pine-island_dakota

@@ -5 +5 @@
 
 #MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015a.app/"
+MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
 
 #ISSM CONFIGURATION 
@@ -12 +12 @@
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lpmpich -lmpich -lmpl" \
+        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
@@ -36 +36 @@
 EXTERNALPACKAGES="autotools    install.sh
                                                 cmake            install.sh
-                                                mpich        install-3.0-macosx64.sh
+                                                mpich        install-3.2-macosx64.sh
                                                 chaco        install-macosx64.sh
                                                 m1qn3        install.sh
-                                                petsc        install-3.5-macosx64.sh
+                                                petsc        install-3.7-macosx64.sh
                                                 triangle     install-macosx64.sh
                                                 boost        install-1.55-macosx-el_capitan.sh