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

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2018-08-28 13:39:06 -0700 (Tue, 28 Aug 2018)
New Revision: 23196

Modified:
   issm/trunk/jenkins/linux64_ross_static
   issm/trunk/jenkins/macosx_pine-island_static
Log:
CHG: Committed wrong file :(

Modified: issm/trunk/jenkins/linux64_ross_static
===================================================================
--- issm/trunk/jenkins/linux64_ross_static	2018-08-28 20:31:08 UTC (rev 23195)
+++ issm/trunk/jenkins/linux64_ross_static	2018-08-28 20:39:06 UTC (rev 23196)
@@ -6,7 +6,7 @@
 #MATLAB path
 MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
-#ISSM CONFIGURATION 
+#ISSM CONFIGURATION
 ISSM_CONFIG='--prefix=$ISSM_DIR \
 	--disable-static \
 	--enable-standalone-executables \
@@ -15,7 +15,7 @@
 	--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 -lmpifort" \
+	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
 	--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/ \
@@ -60,6 +60,6 @@
 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-##                           FS                    
+##                           FS
 #PYTHON_NROPTIONS="--exclude_name 'Dakota'"
 #MATLAB_NROPTIONS="'exclude',[243,701,702,703,435,IdFromString('Dakota')]"

Modified: issm/trunk/jenkins/macosx_pine-island_static
===================================================================
--- issm/trunk/jenkins/macosx_pine-island_static	2018-08-28 20:31:08 UTC (rev 23195)
+++ issm/trunk/jenkins/macosx_pine-island_static	2018-08-28 20:39:06 UTC (rev 23196)
@@ -4,7 +4,7 @@
 #-------------------------------#
 
 #MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2017b.app/"
+MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
 
 #ISSM CONFIGURATION
 ISSM_CONFIG='--prefix=$ISSM_DIR \
@@ -22,7 +22,7 @@
 	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
 	--with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
-	--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-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-numthreads=4'
 
 #PYTHON and MATLAB testing
@@ -38,7 +38,7 @@
 						cmake        install.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
 						math77        install.sh
 						gmsh          install-static.sh