[issm-svn] r23225 - in issm/trunk: externalpackages/mpich externalpackages/petsc jenkins

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2018-09-06 10:19:26 -0700 (Thu, 06 Sep 2018)
New Revision: 23225

Modified:
   issm/trunk/externalpackages/mpich/install-3.2-linux64-static.sh
   issm/trunk/externalpackages/petsc/install-3.7-linux64-static.sh
   issm/trunk/jenkins/linux64_ross_static
Log:
CHG: Final commit for Linux Binaries build

Modified: issm/trunk/externalpackages/mpich/install-3.2-linux64-static.sh
===================================================================
--- issm/trunk/externalpackages/mpich/install-3.2-linux64-static.sh	2018-09-06 06:10:23 UTC (rev 23224)
+++ issm/trunk/externalpackages/mpich/install-3.2-linux64-static.sh	2018-09-06 17:19:26 UTC (rev 23225)
@@ -21,16 +21,14 @@
 	--prefix="$ISSM_DIR/externalpackages/mpich/install" \
 	--disable-shared \
 	--enable-strict=all \
+	--enable-fast \
 	--with-pic
 
-# #Compile mpich (this new version supports parallel make)
-# if [ $# -eq 0 ]; then
-# 	make
-# else
-# 	make -j $1
-# fi
+#Compile mpich (this new version supports parallel make)
+if [ $# -eq 0 ]; then
+	make
+else
+	make -j $1
+fi
 
-#Compile MPICH with one thread
-make
-
 make install

Modified: issm/trunk/externalpackages/petsc/install-3.7-linux64-static.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.7-linux64-static.sh	2018-09-06 06:10:23 UTC (rev 23224)
+++ issm/trunk/externalpackages/petsc/install-3.7-linux64-static.sh	2018-09-06 17:19:26 UTC (rev 23225)
@@ -17,21 +17,20 @@
 cd src
 ./config/configure.py \
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
-	--with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \
+	--with-single-library=1 \
 	--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
+	--with-shared-libraries=0 \
+	--with-pic=1 \
 	--with-debugging=0 \
-	--with-valgrind=0 \
-	--with-x=0 \
-	--with-ssl=0 \
-	--with-shared-libraries=0 \
+	--with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \
+	--download-fblaslapack=1 \
 	--download-metis=1 \
 	--download-parmetis=1 \
+	--with-x=0 \
+	--download-scalapack=1 \
 	--download-mumps=1 \
-	--download-fblaslapack=1 \
-	--download-scalapack=1 \
-	--COPTFLAGS="-fPIC" \
-	--CXXOPTFLAGS="-fPIC" \
-	--FOPTFLAGS="-fPIC"
+	--with-ssl=0 \
+	--with-valgrind=0
 
 #Compile and intall
 make

Modified: issm/trunk/jenkins/linux64_ross_static
===================================================================
--- issm/trunk/jenkins/linux64_ross_static	2018-09-06 06:10:23 UTC (rev 23224)
+++ issm/trunk/jenkins/linux64_ross_static	2018-09-06 17:19:26 UTC (rev 23225)
@@ -15,7 +15,7 @@
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
 	--with-mpi-libflags="$ISSM_DIR/externalpackages/mpich/install/lib/libmpifort.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpi.a -lrt -lpthread" \
-	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
+	--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 \
@@ -23,7 +23,8 @@
 	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
 	--with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
 	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
-	--with-pic'
+	--with-pic \
+	--with-numthreads=4'
 
 #PYTHON and MATLAB testing
 MATLAB_TEST=0
@@ -50,10 +51,10 @@
 
 #number of cpus used in ISSM installation and compilation (one is usually
 #safer as some packages are very sensitive to parallel compilation)
-NUMCPUS_INSTALL=1
+NUMCPUS_INSTALL=10
 
 #number of cpus used in the nightly runs.
-NUMCPUS_RUN=1
+NUMCPUS_RUN=10
 
 #Nightly run options. The matlab routine runme.m will be called
 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable