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

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2018-09-03 22:29:57 -0700 (Mon, 03 Sep 2018)
New Revision: 23209

Modified:
   issm/trunk/externalpackages/mpich/install-3.2-linux64-static.sh
   issm/trunk/externalpackages/mpich/install-3.2-linux64.sh
   issm/trunk/jenkins/linux64_ross_static
Log:
BUG: Copied to wrong MPICH install script; missing backslash in Jenkins config.

Modified: issm/trunk/externalpackages/mpich/install-3.2-linux64-static.sh
===================================================================
--- issm/trunk/externalpackages/mpich/install-3.2-linux64-static.sh	2018-09-04 03:30:58 UTC (rev 23208)
+++ issm/trunk/externalpackages/mpich/install-3.2-linux64-static.sh	2018-09-04 05:29:57 UTC (rev 23209)
@@ -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
@@ -18,12 +18,19 @@
 #Configure mpich
 cd src
 ./configure \
-	--prefix="$ISSM_DIR/externalpackages/mpich/install"
+	--prefix="$ISSM_DIR/externalpackages/mpich/install" \
+	--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/externalpackages/mpich/install-3.2-linux64.sh
===================================================================
--- issm/trunk/externalpackages/mpich/install-3.2-linux64.sh	2018-09-04 03:30:58 UTC (rev 23208)
+++ issm/trunk/externalpackages/mpich/install-3.2-linux64.sh	2018-09-04 05:29:57 UTC (rev 23209)
@@ -19,19 +19,12 @@
 cd src
 ./configure \
 	--prefix="$ISSM_DIR/externalpackages/mpich/install" \
-	--disable-shared \
-	--enable-strict=all \
-	--with-pic
+	--enable-shared
 
-# #Compile mpich (this new version supports parallel make)
-# if [ $# -eq 0 ]; then
-# 	make
-# else
-# 	make -j $1
-# fi
-
-#Compile MPICH with one thread
-make
-
+#Compile mpich (this new version supports parallel make)
+if [ $# -eq 0 ]; then
+	make
+else
+	make -j $1
+fi
 make install
-

Modified: issm/trunk/jenkins/linux64_ross_static
===================================================================
--- issm/trunk/jenkins/linux64_ross_static	2018-09-04 03:30:58 UTC (rev 23208)
+++ issm/trunk/jenkins/linux64_ross_static	2018-09-04 05:29:57 UTC (rev 23209)
@@ -19,7 +19,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="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran"
+	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
 	--with-pic'
 
 #PYTHON and MATLAB testing