[issm-svn] r22223 - issm/trunk/jenkins

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2017-11-03 13:23:41 -0700 (Fri, 03 Nov 2017)
New Revision: 22223

Modified:
   issm/trunk/jenkins/macosx_pine-island_static
Log:
CHG: Adjusted configuration to allow static libraries to be built.

Modified: issm/trunk/jenkins/macosx_pine-island_static
===================================================================
--- issm/trunk/jenkins/macosx_pine-island_static	2017-11-03 19:14:11 UTC (rev 22222)
+++ issm/trunk/jenkins/macosx_pine-island_static	2017-11-03 20:23:41 UTC (rev 22223)
@@ -4,7 +4,7 @@
 #-------------------------------#
 
 #MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
+MATLAB_PATH="/Applications/MATLAB_R2017b.app/"
 
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR \
@@ -14,18 +14,18 @@
 	--with-matlab-dir=$MATLAB_PATH \
 	--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 -lmpi -lfmpich" \
-	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich -lmpl -lpmpich" \
+	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
-	--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin14/5.2.0/libgcc.a" \
+	--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin15/6.1.0/libgcc.a" \
 	--with-numthreads=4'
 
 #PYTHON and MATLAB testing
-MATLAB_TEST=0
+MATLAB_TEST=1
 PYTHON_TEST=0
 
 #-----------------------------------#
@@ -35,9 +35,9 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools    install.sh
 						cmake        install.sh
-						mpich        install-3.2-macosx64-static.sh
+						mpich        install-3.0-macosx64-static.sh
 						m1qn3        install.sh
-						petsc        install-3.7-macosx64-static.sh
+						petsc        install-3.6-macosx64-static.sh
 						triangle     install-macosx64.sh
 						shell2junit  install.sh"