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

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2018-09-03 20:30:58 -0700 (Mon, 03 Sep 2018)
New Revision: 23208

Modified:
   issm/trunk/externalpackages/mpich/install-3.2-linux64.sh
   issm/trunk/jenkins/linux64_ross_static
Log:
CHG: Configuration for Linux Ubuntu Binaries that links static MPICH libs.

Modified: issm/trunk/externalpackages/mpich/install-3.2-linux64.sh
===================================================================
--- issm/trunk/externalpackages/mpich/install-3.2-linux64.sh	2018-08-31 21:37:15 UTC (rev 23207)
+++ issm/trunk/externalpackages/mpich/install-3.2-linux64.sh	2018-09-04 03:30:58 UTC (rev 23208)
@@ -8,7 +8,7 @@
 #Download from ISSM server
 $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich-3.2.tar.gz' 'mpich-3.2.tar.gz'
 
-#Untar 
+#Untar
 tar -zxvf  mpich-3.2.tar.gz
 
 #Move mpich into src directory
@@ -19,12 +19,19 @@
 cd src
 ./configure \
 	--prefix="$ISSM_DIR/externalpackages/mpich/install" \
-	--enable-shared
+	--disable-shared \
+	--enable-strict=all \
+	--with-pic
 
-#Compile mpich (this new version supports parallel make)
-if [ $# -eq 0 ]; then
-	make
-else
-	make -j $1
-fi
-make install 
+# #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/jenkins/linux64_ross_static
===================================================================
--- issm/trunk/jenkins/linux64_ross_static	2018-08-31 21:37:15 UTC (rev 23207)
+++ issm/trunk/jenkins/linux64_ross_static	2018-09-04 03:30:58 UTC (rev 23208)
@@ -8,15 +8,11 @@
 
 #ISSM CONFIGURATION
 ISSM_CONFIG='--prefix=$ISSM_DIR \
-	--disable-shared \
-	--enable-standalone-executables \
-	--enable-standalone-libraries \
-	--enable-standalone-modules \
 	--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/libmpi.a -L$ISSM_DIR/externalpackages/mpich/install/lib/libmpifort.a" \
-	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+	--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-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,10 +19,8 @@
 	--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="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.a" \
-	--with-numthreads=4 \
-	CXXFLAGS="-O2 -static" \
-	CFLAGS="-O2 -static"'
+	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran"
+	--with-pic'
 
 #PYTHON and MATLAB testing
 MATLAB_TEST=0
@@ -53,10 +47,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=4
+NUMCPUS_INSTALL=1
 
 #number of cpus used in the nightly runs.
-NUMCPUS_RUN=2
+NUMCPUS_RUN=1
 
 #Nightly run options. The matlab routine runme.m will be called
 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable