[issm-svn] r23343 - in issm/trunk: externalpackages/gmsh jenkins

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2018-09-26 23:10:47 -0700 (Wed, 26 Sep 2018)
New Revision: 23343

Modified:
   issm/trunk/externalpackages/gmsh/install-static.sh
   issm/trunk/jenkins/macosx_pine-island_static
Log:
CHG: Attempt at fixing Mac binaries gmsh issue (cannot get a reliable build going on High Sierra, so will have to test on Jenkins)

Modified: issm/trunk/externalpackages/gmsh/install-static.sh
===================================================================
--- issm/trunk/externalpackages/gmsh/install-static.sh	2018-09-26 18:13:04 UTC (rev 23342)
+++ issm/trunk/externalpackages/gmsh/install-static.sh	2018-09-27 06:10:47 UTC (rev 23343)
@@ -26,7 +26,7 @@
 
 #Configure
 cd install
-cmake ../src -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" -DENABLE_MPI=0 -DENABLE_METIS=0
+cmake ../src -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" -DENABLE_BUILD_LIB=1 -DENABLE_METIS=0
 
 #Compile and install
 if [ $# -eq 0 ]; then

Modified: issm/trunk/jenkins/macosx_pine-island_static
===================================================================
--- issm/trunk/jenkins/macosx_pine-island_static	2018-09-26 18:13:04 UTC (rev 23342)
+++ issm/trunk/jenkins/macosx_pine-island_static	2018-09-27 06:10:47 UTC (rev 23343)
@@ -4,17 +4,16 @@
 #-------------------------------#
 
 #MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
+MATLAB_PATH="/Applications/MATLAB_R2015b.app"
 
 #ISSM CONFIGURATION
 ISSM_CONFIG='--prefix=$ISSM_DIR \
-	--disable-static \
 	--enable-standalone-executables \
 	--enable-standalone-libraries \
 	--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 -lmpich -lmpl -lpmpich" \
+	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
+	--with-mpi-libflags="$ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a" \
 	--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 \
@@ -23,6 +22,7 @@
 	--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-darwin14/5.2.0/libgcc.a" \
+	--with-pic \
 	--with-numthreads=4'
 
 #PYTHON and MATLAB testing
@@ -36,9 +36,9 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools    install.sh
 						cmake        install.sh
-						mpich        install-3.0-macosx64-static.sh
+						mpich        install-3.2-macosx64-static.sh
 						m1qn3        install.sh
-						petsc        install-3.6-macosx64-static.sh
+						petsc        install-3.7-macosx64-static.sh
 						triangle     install-macosx64.sh
 						math77        install.sh
 						gmsh          install-static.sh
@@ -54,7 +54,7 @@
 NUMCPUS_INSTALL=4
 
 #number of cpus used in the nightly runs.
-NUMCPUS_RUN=2
+NUMCPUS_RUN=4
 
 #Nightly run options. The matlab routine runme.m will be called
 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
@@ -61,5 +61,5 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
 ##                           bamg mesh   FS
-#PYTHON_NROPTIONS="--exclude_name 'Dakota'"
-#MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,703,435,IdFromString('Dakota')]"
+#PYTHON_NROPTIONS=""
+#MATLAB_NROPTIONS=""