Index: /issm/trunk-jpl/etc/environment.sh
===================================================================
--- /issm/trunk-jpl/etc/environment.sh	(revision 24631)
+++ /issm/trunk-jpl/etc/environment.sh	(revision 24632)
@@ -196,4 +196,5 @@
 if [ -d "$PETSC_DIR" ]; then
 	export PETSC_DIR
+	path_prepend "${PETSC_DIR}/bin" # In case we have installed MPICH via PETSc
 	ld_library_path_append "${PETSC_DIR}/lib"
 fi
Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh	(revision 24631)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh	(revision 24632)
@@ -6,10 +6,10 @@
 #
 DAK_ROOT=${ISSM_DIR}/externalpackages/dakota
-MPI_INSTALL=${ISSM_DIR}/externalpackages/mpich/install
+MPI_INSTALL=${ISSM_DIR}/externalpackages/petsc/install
 VER="6.2"
 
 ## Environment
 #
-export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
+export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2cblas -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
 export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install
 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version)
@@ -18,5 +18,5 @@
 export DAK_INSTALL=${DAK_ROOT}/install
 export DAK_SRC=${DAK_ROOT}/src
-export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
+export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2clapack -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
 export MPIHOME=${MPI_INSTALL} # This appears to only be used by certain external packages and examples
 
Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh	(revision 24631)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh	(revision 24632)
@@ -6,10 +6,10 @@
 #
 DAK_ROOT=${ISSM_DIR}/externalpackages/dakota
-MPI_INSTALL=${ISSM_DIR}/externalpackages/mpich/install
+MPI_INSTALL=${ISSM_DIR}/externalpackages/petsc/install
 VER="6.2"
 
 ## Environment
 #
-export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
+export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2cblas" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
 export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install
 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version)
@@ -18,5 +18,5 @@
 export DAK_INSTALL=${DAK_ROOT}/install
 export DAK_SRC=${DAK_ROOT}/src
-export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
+export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2clapack" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
 export MPIHOME=${MPI_INSTALL} # This appears to only be used by certain external packages and examples
 
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.12-linux-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.12-linux-static.sh	(revision 24632)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.12-linux-static.sh	(revision 24632)
@@ -0,0 +1,63 @@
+#!/bin/bash
+set -eu
+
+
+## Constants
+#
+VER="3.12.3"
+
+## Environment
+#
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/petsc-lite-${VER}.tar.gz" "petsc-${VER}.tar.gz"
+
+# Unpack source
+tar -zxvf  petsc-${VER}.tar.gz
+
+# Cleanup
+rm -rf install src
+mkdir install src
+
+# Move source to 'src' directory
+mv petsc-${VER}/* src/
+rm -rf petsc-${VER}
+
+# Configure
+#
+# NOTE: Cannot use --with-fpic option when compiling static libs,
+#
+#		Cannot determine compiler PIC flags if shared libraries is turned off
+#		Either run using --with-shared-libraries or --with-pic=0 and supply the
+#		compiler PIC flag via CFLAGS, CXXXFLAGS, and FCFLAGS
+#
+cd src
+./config/configure.py \
+	--prefix="${ISSM_DIR}/externalpackages/petsc/install" \
+	--PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \
+	--with-shared-libraries=0 \
+	--CFLAGS="-fPIC" \
+	--CXXFLAGS="-fPIC" \
+	--FFLAGS="-fPIC" \
+	--COPTFLAGS="-O3" \
+	--CXXOPTFLAGS="-O3" \
+	--FOPTFLAGS="-O3" \
+	--with-debugging=0 \
+	--with-valgrind=0 \
+	--with-x=0 \
+	--with-ssl=0 \
+	--download-f2cblaslapack=1 \
+	--download-mpich=1 \
+	--download-metis=1 \
+	--download-parmetis=1 \
+	--download-scalapack=1 \
+	--download-mumps=1
+
+# Compile and install
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.12-linux.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.12-linux.sh	(revision 24632)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.12-linux.sh	(revision 24632)
@@ -0,0 +1,53 @@
+#!/bin/bash
+set -eu
+
+
+## Constants
+#
+VER="3.12.3"
+
+## Environment
+#
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/petsc-lite-${VER}.tar.gz" "petsc-${VER}.tar.gz"
+
+# Unpack source
+tar -zxvf  petsc-${VER}.tar.gz
+
+# Cleanup
+rm -rf install src
+mkdir install src
+
+# Move source to 'src' directory
+mv petsc-${VER}/* src/
+rm -rf petsc-${VER}
+
+# Configure
+cd src
+./config/configure.py \
+	--prefix="${ISSM_DIR}/externalpackages/petsc/install" \
+	--PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \
+	--COPTFLAGS="-O3" \
+	--CXXOPTFLAGS="-O3" \
+	--FOPTFLAGS="-O3" \
+	--with-debugging=0 \
+	--with-valgrind=0 \
+	--with-x=0 \
+	--with-ssl=0 \
+	--with-pic=1 \
+	--download-f2cblaslapack=1 \
+	--download-mpich=1 \
+	--download-metis=1 \
+	--download-parmetis=1 \
+	--download-scalapack=1 \
+	--download-mumps=1
+
+# Compile and install
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
Index: sm/trunk-jpl/jenkins/linux64_ross
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross	(revision 24631)
+++ 	(revision )
@@ -1,74 +1,0 @@
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-# MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
-
-# ISSM CONFIGURATION
-ISSM_CONFIG='\
-	--prefix=$ISSM_DIR \
-	--disable-static \
-	--with-matlab-dir=$MATLAB_PATH \
-	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
-	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
-	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
-	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
-	--with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
-	--with-numthreads=4 \
-	--enable-development \
-	--enable-debugging \
-'
-
-# Test suites
-MATLAB_TEST=1
-PYTHON_TEST=0
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-# List of external packages to be installed and their installation scripts
-#
-EXTERNALPACKAGES="
-	autotools	install.sh
-	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.11-linux.sh
-	triangle	install-linux64.sh
-	chaco		install.sh
-	m1qn3		install.sh
-	semic		install.sh
-	shell2junit	install.sh
-"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"
-PYTHON_NROPTIONS=""
Index: sm/trunk-jpl/jenkins/linux64_ross_ad
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_ad	(revision 24631)
+++ 	(revision )
@@ -1,84 +1,0 @@
-##-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
-
-#ISSM CONFIGURATION
-ISSM_CONFIG='\
-	--prefix=$ISSM_DIR \
-	--disable-static \
-	--without-kriging \
-	--without-kml \
-	--without-GiaIvins \
-	--without-Love \
-	--with-matlab-dir=$MATLAB_PATH \
-	--with-python-dir=/usr \
-	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
-	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
-	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
-	--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
-	--with-numthreads=4 \
-	--enable-development \
-	--enable-debugging \
-'
-
-# Test suites
-MATLAB_TEST=1
-PYTHON_TEST=1
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-#List of external pakages to be installed and their installation scripts
-#
-# NOTE: The PETSc libraries are compiled but not used as they conflict with
-#		ADOL-C: PETSc is really just being used as an installer for other
-#		external packages.
-EXTERNALPACKAGES="
-	autotools	install.sh
-	cmake		install.sh
-	mpich		install-3.2-linux64.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux64.sh
-	triangle	install-linux64.sh
-	gsl			install-linux64.sh
-	adolc		install.sh
-	shell2junit	install.sh
-"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-# NOTE:
-# - test3010 is skipped because it triggers GEMB module and a subsequent
-#	failure on ampioff configuration (really, likely a segmentation fault)
-#
-MATLAB_NROPTIONS="'benchmark','adolc','id',[3001:3019],'exclude',3010"
-PYTHON_NROPTIONS="--benchmark=adolc -i 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 --exclude=3010"
Index: sm/trunk-jpl/jenkins/linux64_ross_ampi
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_ampi	(revision 24631)
+++ 	(revision )
@@ -1,87 +1,0 @@
-#
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
-
-#ISSM CONFIGURATION
-ISSM_CONFIG='\
-	--prefix=$ISSM_DIR \
-	--disable-static \
-	--without-kriging \
-	--without-kml \
-	--without-GiaIvins \
-	--without-Love \
-	--with-matlab-dir=$MATLAB_PATH \
-	--with-python-dir=/usr \
-	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
-	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
-	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \
-	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
-	--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
-	--with-numthreads=4 \
-	--enable-development \
-	--enable-debugging \
-'
-
-# PYTHON and MATLAB testing
-MATLAB_TEST=1
-PYTHON_TEST=1
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-#List of external pakages to be installed and their installation scripts
-#
-# NOTE: The PETSc libraries are compiled but not used as they conflict with
-#		ADOL-C: PETSc is really just being used as an installer for other
-#		external packages.
-EXTERNALPACKAGES="
-	autotools		install.sh
-	cmake			install.sh
-	mpich			install-3.2-linux64.sh
-	lapack			install-3.8-linux.sh
-	petsc			install-3.7-linux64.sh
-	triangle		install-linux64.sh
-	gsl				install-linux64.sh
-	adjoinablempi	install.sh
-	adolc			install-withampi.sh
-	shell2junit		install.sh
-"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-# NOTE:
-# - test3010 is skipped because it triggers GEMB module and a subsequent
-#	failure on ampioff configuration (really, likely a segmentation fault)
-#
-MATLAB_NROPTIONS="'benchmark','adolc','id',[3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3119],'exclude',3010"
-PYTHON_NROPTIONS="--benchmark=adolc -i 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3101 3102 3103 3104 3105 3106 3107 3108 3109 3119 --exclude=3010"
Index: sm/trunk-jpl/jenkins/linux64_ross_codi
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_codi	(revision 24631)
+++ 	(revision )
@@ -1,82 +1,0 @@
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-# MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2019b"
-
-# ISSM CONFIGURATION
-ISSM_CONFIG='\
-	--prefix=$ISSM_DIR \
-	--without-kriging \
-	--without-kml \
-	--without-GiaIvins \
-	--without-Love \
-	--with-matlab-dir=$MATLAB_PATH \
-	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/7 -lgfortran" \
-	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
-	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
-	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
-	--with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
-	--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
-	--with-medipack-dir="$ISSM_DIR/externalpackages/medipack/install" \
-	--with-codipack-dir="$ISSM_DIR/externalpackages/codipack/install" \
-	--with-numthreads=4 \
-	--enable-tape-alloc \
-	--enable-development \
-	--enable-debugging \
-'
-
-# Test suites
-MATLAB_TEST=1
-PYTHON_TEST=0
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-#List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="
-	autotools	install.sh
-	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.11-linux.sh
-	triangle	install-linux64.sh
-	chaco		install.sh
-	m1qn3		install.sh
-	semic		install.sh
-	gsl			install-linux64.sh
-	medipack	install.sh
-	codipack	install.sh
-	shell2junit install.sh
-"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-MATLAB_NROPTIONS="'benchmark','all','id',[3015,3119,3480]"
-PYTHON_NROPTIONS="--benchmark='all' -i 3015 3119 3480"
Index: sm/trunk-jpl/jenkins/linux64_ross_dakota
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_dakota	(revision 24631)
+++ 	(revision )
@@ -1,81 +1,0 @@
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
-
-#ISSM CONFIGURATION
-ISSM_CONFIG='\
-	--prefix=$ISSM_DIR \
-	--disable-static \
-	--with-matlab-dir=$MATLAB_PATH \
-	--with-python-dir=/usr \
-	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
-	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
-	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
-	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
-	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
-	--with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
-	--with-cxxoptflags="-std=c++11" \
-	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
-	--with-numthreads=4 \
-	--enable-development \
-	--enable-debugging \
-'
-
-# Test suites
-MATLAB_TEST=1
-PYTHON_TEST=1
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-#List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="
-	autotools	install.sh
-	cmake		install.sh
-	mpich		install-3.2-linux64.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux64.sh
-	triangle	install-linux64.sh
-	boost		install-1.55-linux.sh
-	dakota		install-6.2-linux64.sh
-	chaco		install.sh
-	m1qn3		install.sh
-	shell2junit	install.sh
-"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-# NOTE:
-# - See test418.py for reason why it is excluded for now.
-#
-MATLAB_NROPTIONS="'exclude',[243,435,701,702],'id',[IdFromString('Dakota')]"
-PYTHON_NROPTIONS="--exclude 243 418 435 701 702 --include_name 'Dakota'"
Index: sm/trunk-jpl/jenkins/linux64_ross_dakota_static
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_dakota_static	(revision 24631)
+++ 	(revision )
@@ -1,72 +1,0 @@
-
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
-
-#ISSM CONFIGURATION
-ISSM_CONFIG='--prefix=$ISSM_DIR\
-	--enable-standalone-executables \
-	--enable-standalone-modules \
-	--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="$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 \
-	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
-	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
-	--with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
-	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
-	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu -lgfortran" \
-	--with-numthreads=4 \
-	--with-pic'
-
-# Test suites
-MATLAB_TEST=0
-PYTHON_TEST=0
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-#List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="autotools     install.sh
-						cmake        install.sh
-						chaco         install.sh
-						mpich         install-3.2-linux64-static.sh
-						m1qn3         install.sh
-						petsc         install-3.7-linux64-static.sh
-						triangle      install-linux64.sh
-						boost         install-1.55-linux64-static.sh
-						dakota        install-6.2-linux64-static.sh
-						shell2junit   install.sh"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-MATLAB_NROPTIONS=""
-PYTHON_NROPTIONS=""
Index: sm/trunk-jpl/jenkins/linux64_ross_gia
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_gia	(revision 24631)
+++ 	(revision )
@@ -1,73 +1,0 @@
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
-
-#ISSM CONFIGURATION
-ISSM_CONFIG='\
-	--prefix=$ISSM_DIR \
-	--disable-static \
-	--with-matlab-dir=$MATLAB_PATH \
-	--with-python-dir=/usr \
-	--with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \
-	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
-	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
-	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
-	--with-gia=yes \
-	--with-numthreads=4 \
-	--enable-development \
-	--enable-debugging \
-'
-
-# Test suites
-MATLAB_TEST=1
-PYTHON_TEST=0
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-#List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="
-	autotools	install.sh
-	cmake		install.sh
-	mpich		install-3.2-linux64.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux64.sh
-	triangle	install-linux64.sh
-	math77		install.sh
-	gmsh		install.sh
-	shell2junit	install.sh
-"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-MATLAB_NROPTIONS="'benchmark','all','id',[2001:2100]"
-PYTHON_NROPTIONS=""
Index: sm/trunk-jpl/jenkins/linux64_ross_iceocean
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_iceocean	(revision 24631)
+++ 	(revision )
@@ -1,77 +1,0 @@
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-# MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2019b"
-
-# ISSM CONFIGURATION
-ISSM_CONFIG='\
-	--prefix=$ISSM_DIR \
-	--disable-static \
-	--with-matlab-dir=$MATLAB_PATH \
-	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/7 -lgfortran" \
-	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
-	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
-	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
-	--with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
-	--with-numthreads=4 \
-	--enable-development \
-	--enable-debugging \
-'
-
-# Test suites
-MATLAB_TEST=1
-PYTHON_TEST=0
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-#List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="
-	autotools	install.sh
-	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.11-linux.sh
-	triangle	install-linux64.sh
-	chaco		install.sh
-	m1qn3		install.sh
-	semic		install.sh
-	shell2junit	install.sh
-"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-# NOTE: Currently not including 4003 while Dimitri and Helenen work on the
-#		coupling
-#
-MATLAB_NROPTIONS="'benchmark','all','id',[4001,4002]"
-PYTHON_NROPTIONS=""
-
Index: sm/trunk-jpl/jenkins/linux64_ross_javascript
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_javascript	(revision 24631)
+++ 	(revision )
@@ -1,58 +1,0 @@
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-# ISSM CONFIGURATION
-ISSM_CONFIG='\
-    --prefix=$ISSM_DIR \
-    --disable-shared \
-    --with-javascript \
-    --without-fortran \
-    --without-GiaIvins \
-    --without-Love \
-    --without-kml \
-    --without-kriging \
-    --with-gsl-dir="$ISSM_DIR/externalpackages/gsl/install-javascript" \
-    --with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install-javascript" \
-'
-
-# Test suites
-MATLAB_TEST=0
-PYTHON_TEST=0
-JAVASCRIPT_TEST=1
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-#List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="
-	autotools	install.sh
-	cmake		install.sh
-	emscripten	install.sh
-	gsl			install-javascript.sh
-	triangle	install-javascript.sh
-	shell2junit	install.sh
-"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-MATLAB_NROPTIONS=""
-PYTHON_NROPTIONS=""
Index: sm/trunk-jpl/jenkins/linux64_ross_python
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_python	(revision 24631)
+++ 	(revision )
@@ -1,76 +1,0 @@
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-#ISSM CONFIGURATION
-ISSM_CONFIG='\
-	--prefix=$ISSM_DIR \
-	--disable-static \
-	--with-python-dir=/usr \
-	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
-	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/7 -lgfortran" \
-	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
-	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
-	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
-	--with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
-	--with-numthreads=4 \
-	--enable-development \
-	--enable-debugging \
-'
-
-# Test suites
-MATLAB_TEST=0
-PYTHON_TEST=1
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-# List of external packages to be installed and their installation scripts
-#
-# TODO:
-# - After upgrading Jenkins nodes to Ubuntu 18, use MPICH 3.3 and PETSc 3.11
-#	(which will install zlib, HDF5, and NetCDF).
-#
-EXTERNALPACKAGES="
-	autotools	install.sh
-	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.11-linux.sh
-	triangle	install-linux64.sh
-	chaco		install.sh
-	m1qn3		install.sh
-	semic		install.sh
-	shell2junit	install.sh
-"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-MATLAB_NROPTIONS=""
-PYTHON_NROPTIONS="--exclude_name 'Dakota'"
Index: sm/trunk-jpl/jenkins/linux64_ross_se
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_se	(revision 24631)
+++ 	(revision )
@@ -1,89 +1,0 @@
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
-
-#ISSM CONFIGURATION
-ISSM_CONFIG='\
-	--prefix=$ISSM_DIR \
-	--disable-static \
-	--with-matlab-dir=$MATLAB_PATH \
-	--with-python-dir=/usr \
-	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
-	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
-	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
-	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
-	--with-numthreads=4 \
-	--enable-development \
-	--enable-debugging \
-'
-
-# Test suites
-MATLAB_TEST=1
-PYTHON_TEST=1
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-# List of external packages to be installed and their installation scripts
-#
-# TODO:
-# - After upgrading Jenkins nodes to Ubuntu 18, use MPICH 3.3 and PETSc 3.11
-#	(which will install zlib, HDF5, and NetCDF).
-#
-EXTERNALPACKAGES="
-	autotools	install.sh
-	cmake		install.sh
-	mpich		install-3.2-linux64.sh
-	hdf5		install-1.10-parallel.sh
-	netcdf		install-4.7-parallel.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux64.sh
-	triangle	install-linux64.sh
-	chaco		install.sh
-	m1qn3		install.sh
-	semic		install.sh
-	boost		install-1.55-linux.sh
-	proj		install-6.2.sh
-	gdal		install-3.0-netcdf.sh
-	gshhg		install.sh
-	gmt			install-6.0-linux.sh
-	gmsh		install.sh
-	shell2junit	install.sh
-"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-#       compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of cpus used in the nightly runs
-#
-# NOTE: Possible problem of access to all_vertices.txt if more than 1.
-#
-NUMCPUS_RUN=1
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-MATLAB_NROPTIONS="'benchmark','slr'"
-PYTHON_NROPTIONS="--benchmark=slr"
Index: sm/trunk-jpl/jenkins/linux64_ross_static
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_static	(revision 24631)
+++ 	(revision )
@@ -1,69 +1,0 @@
-
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
-
-#ISSM CONFIGURATION
-ISSM_CONFIG='--prefix=$ISSM_DIR \
-	--enable-standalone-executables \
-	--enable-standalone-modules \
-	--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="$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 \
-	--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 -lgfortran" \
-	--with-numthreads=4 \
-	--with-pic'
-
-# Test suites
-MATLAB_TEST=0
-PYTHON_TEST=0
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-#List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="autotools    install.sh
-						cmake        install.sh
-						mpich        install-3.2-linux64-static.sh
-						m1qn3        install.sh
-						petsc        install-3.7-linux64-static.sh
-						triangle     install-linux64.sh
-						math77        install.sh
-						gmsh          install-static.sh
-						shell2junit  install.sh"
-
-#-----------------#
-# 4: test options #
-#-----------------#
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation.
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=2
-
-# Nightly run options
-#
-# See documentation in test/NightlyRun/runme.* for more information.
-#
-MATLAB_NROPTIONS=""
-PYTHON_NROPTIONS=""
Index: /issm/trunk-jpl/jenkins/ross-debian_linux
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux	(revision 24632)
@@ -12,7 +12,7 @@
 	--with-matlab-dir=${MATLAB_PATH} \
 	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
-	--with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -32,7 +32,5 @@
 	autotools	install-debian-linux.sh
 	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux.sh
+	petsc		install-3.12-linux.sh
 	triangle	install-linux.sh
 	chaco		install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff	(revision 24632)
@@ -18,8 +18,8 @@
 	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
 	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
-	--with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include  \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include  \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
 	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
-	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -40,7 +40,5 @@
 	autotools	install-debian-linux.sh
 	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux.sh
+	petsc		install-3.12-linux.sh
 	triangle	install-linux.sh
 	gsl			install-linux64.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion	(revision 24632)
@@ -18,9 +18,9 @@
 	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
 	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
-	--with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include  \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include  \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
 	--with-ampi-dir=${ISSM_DIR}/externalpackages/adjoinablempi/install \
 	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
-	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -41,7 +41,5 @@
 	autotools		install-debian-linux.sh
 	cmake			install.sh
-	mpich			install-3.3.sh
-	lapack			install-3.8-linux.sh
-	petsc			install-3.7-linux.sh
+	petsc			install-3.12-linux.sh
 	triangle		install-linux.sh
 	gsl				install-linux64.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-binaries
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-binaries	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-binaries	(revision 24632)
@@ -18,7 +18,7 @@
 	--with-matlab-dir=${MATLAB_PATH} \
 	--with-fortran-lib="-L${ISSM_DIR}/lib -lgfortran" \
-	--with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -37,7 +37,5 @@
 	autotools	install-debian-linux.sh
 	cmake		install.sh
-	mpich		install-3.3-static.sh
-	lapack		install-3.8-linux-static.sh
-	petsc		install-3.7-linux-static.sh
+	petsc		install-3.12-linux-static.sh
 	triangle	install-linux-static.sh
 	chaco		install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-with_dakota
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-with_dakota	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-with_dakota	(revision 24632)
@@ -21,7 +21,7 @@
 	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
 	--with-fortran-lib="-L${ISSM_DIR}/lib -lgfortran" \
-	--with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -43,7 +43,5 @@
 	autotools	install-debian-linux.sh
 	cmake		install.sh
-	mpich		install-3.3-static.sh
-	lapack		install-3.8-linux-static.sh
-	petsc		install-3.7-linux-static.sh
+	petsc		install-3.12-linux-static.sh
 	boost		install-1.55-linux-static.sh
 	dakota		install-6.2-linux-static.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-codipack
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-codipack	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-codipack	(revision 24632)
@@ -16,7 +16,7 @@
 	--with-matlab-dir=${MATLAB_PATH} \
 	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
-	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -38,7 +38,5 @@
 	autotools	install-debian-linux.sh
 	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux.sh
+	petsc		install-3.12-linux.sh
 	triangle	install-linux.sh
 	chaco		install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-dakota
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-dakota	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-dakota	(revision 24632)
@@ -16,7 +16,7 @@
 	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
 	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
-	--with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -38,7 +38,5 @@
 	autotools	install-debian-linux.sh
 	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux.sh
+	petsc		install-3.12-linux.sh
 	boost		install-1.55-linux.sh
 	dakota		install-6.2-linux.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-gia
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-gia	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-gia	(revision 24632)
@@ -15,7 +15,7 @@
 	--with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \
 	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
-	--with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -33,7 +33,5 @@
 	autotools	install-debian-linux.sh
 	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux.sh
+	petsc		install-3.12-linux.sh
 	triangle	install-linux.sh
 	math77		install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean	(revision 24632)
@@ -13,7 +13,7 @@
 	--with-matlab-dir=${MATLAB_PATH} \
 	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
-	--with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -33,7 +33,5 @@
 	autotools	install-debian-linux.sh
 	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux.sh
+	petsc		install-3.12-linux.sh
 	triangle	install-linux.sh
 	chaco		install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-javascript
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-javascript	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-javascript	(revision 24632)
@@ -4,16 +4,16 @@
 
 ISSM_CONFIG='\
-    --prefix=${ISSM_DIR} \
-    --disable-shared \
-    --enable-development \
-    --enable-debugging \
-    --with-javascript \
-    --without-fortran \
-    --without-GiaIvins \
-    --without-Love \
-    --without-kml \
-    --without-kriging \
-    --with-gsl-dir="${ISSM_DIR}/externalpackages/gsl/install-javascript" \
-    --with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install-javascript" \
+	--prefix=${ISSM_DIR} \
+	--disable-shared \
+	--enable-development \
+	--enable-debugging \
+	--with-javascript \
+	--without-fortran \
+	--without-GiaIvins \
+	--without-Love \
+	--without-kml \
+	--without-kriging \
+	--with-gsl-dir="${ISSM_DIR}/externalpackages/gsl/install-javascript" \
+	--with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install-javascript" \
 '
 
@@ -23,10 +23,10 @@
 
 EXTERNALPACKAGES="
-    autotools   install-debian-linux.sh
-    cmake       install.sh
-    emscripten  install.sh
-    gsl         install-javascript.sh
-    triangle    install-linux-javascript.sh
-    shell2junit install.sh
+	autotools	install-debian-linux.sh
+	cmake		install.sh
+	emscripten	install.sh
+	gsl			install-javascript.sh
+	triangle	install-linux-javascript.sh
+	shell2junit	install.sh
 "
 
@@ -44,5 +44,5 @@
 #
 # NOTE: One is usually safer as some packages are very sensitive to parallel
-#       compilation.
+#		compilation.
 #
 NUMCPUS_INSTALL=8
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-python
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-python	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-python	(revision 24632)
@@ -12,7 +12,7 @@
 	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
 	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
-	--with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -29,14 +29,8 @@
 #-------------------#
 
-# TODO:
-# - After upgrading Jenkins nodes to Ubuntu 18, use MPICH 3.3 and PETSc 3.11
-#	(which will install zlib, HDF5, and NetCDF).
-#
 EXTERNALPACKAGES="
 	autotools	install-debian-linux.sh
 	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux.sh
+	petsc		install-3.12-linux.sh
 	triangle	install-linux.sh
 	chaco		install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth	(revision 24631)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth	(revision 24632)
@@ -14,7 +14,7 @@
 	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
 	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
-	--with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
-	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -32,7 +32,5 @@
 	autotools	install-debian-linux.sh
 	cmake		install.sh
-	mpich		install-3.3.sh
-	lapack		install-3.8-linux.sh
-	petsc		install-3.7-linux.sh
+	petsc		install-3.12-linux.sh
 	triangle	install-linux.sh
 	chaco		install.sh
Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 24631)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 24632)
@@ -585,9 +585,9 @@
 						if test "${BOOST_VERSION_MINOR}" == "55"; then
 							DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
-							DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -L$BOOST_ROOT/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system -L${BLASLAPACK_ROOT}/lib -llapack -lblas"
+							DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -L${BOOST_ROOT}/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system ${BLASLAPACKLIB}"
 						elif test "${BOOST_VERSION_MINOR}" = "72"; then
 							DAKOTAFLAGS="-DHAVE_CONFIG_H -DHAVE_CONFIG_H -DDISABLE_DAKOTA_CONFIG_H -DBOOST_DISABLE_ASSERTS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DHAVE_ADAPTIVE_SAMPLING -DHAVE_ESM -DHAVE_CONMIN -DHAVE_DDACE -DHAVE_DREAM -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_NOMAD -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
 							dnl See $ISSM_DIR/dakota/build/src/Makefile.export.Dakota -> Dakota_LIBRARIES
-							DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system -L${BLASLAPACK_ROOT}/lib -llapack -lblas"
+							DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system ${BLASLAPACKLIB}"
 						fi
 					fi
@@ -598,8 +598,8 @@
 						if test "${BOOST_VERSION_MINOR}" == "55"; then
 							DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
-							DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -L$BOOST_ROOT/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system -L${BLASLAPACK_ROOT}/lib -llapack -lblas"
+							DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -L$BOOST_ROOT/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system ${BLASLAPACKLIB}"
 						elif test "${BOOST_VERSION_MINOR}" == "72"; then
 							DAKOTAFLAGS="-DHAVE_CONFIG_H -DHAVE_CONFIG_H -DDISABLE_DAKOTA_CONFIG_H -DBOOST_DISABLE_ASSERTS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DHAVE_ADAPTIVE_SAMPLING -DHAVE_ESM -DHAVE_CONMIN -DHAVE_DDACE -DHAVE_DREAM -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_NOMAD -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
-							DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchosremainder -lteuchosnumerics -lteuchoscomm -lteuchosparameterlist -lteuchosparser -lteuchoscore -lpecos_util -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lapproxnn -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system -L${BLASLAPACK_ROOT}/lib -llapack -lblas"
+							DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchosremainder -lteuchosnumerics -lteuchoscomm -lteuchosparameterlist -lteuchosparser -lteuchoscore -lpecos_util -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lapproxnn -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system ${BLASLAPACKLIB}"
 						fi
 					fi
@@ -1102,4 +1102,108 @@
 	fi
 	AM_CONDITIONAL([MEDIPACK], [test "x${HAVE_MEDIPACK}" == "xyes"])
+	dnl }}}
+	dnl PETSc{{{
+	AC_ARG_WITH(
+		[petsc-dir],
+		AS_HELP_STRING([--with-petsc-dir=DIR], [PETSc root directory, necessary for parallel build]),
+		[PETSC_ROOT=${withval}],
+		[PETSC_ROOT="no"]
+	)
+	AC_MSG_CHECKING([for PETSc])
+	if test "x${PETSC_ROOT}" == "xno"; then
+		HAVE_PETSC=no
+	else
+		HAVE_PETSC=yes
+		if ! test -d "${PETSC_ROOT}"; then
+			AC_MSG_ERROR([PETSc directory provided (${PETSC_ROOT}) does not exist!]);
+		fi
+	fi
+	AC_MSG_RESULT([${HAVE_PETSC}])
+	AM_CONDITIONAL([PETSC], [test "x${HAVE_PETSC}" == "xyes"])
+
+	dnl PETSc libraries and header files
+	if test "x${HAVE_PETSC}" == "xyes"; then
+		AC_MSG_CHECKING(for PETSc version)
+		if ! test -f "${PETSC_ROOT}/include/petscversion.h"; then
+			AC_MSG_ERROR([PETSc not instaled correctly: file (${PETSC_ROOT}/include/petscversion.h) does not exist!]);
+		fi
+		PETSC_MAJOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'`
+		PETSC_MINOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MINOR" | sed 's/#define PETSC_VERSION_MINOR//' | sed 's/ //g'`
+		AC_DEFINE_UNQUOTED(_PETSC_MAJOR_, $PETSC_MAJOR, [PETSc version major])
+		AC_DEFINE_UNQUOTED(_PETSC_MINOR_, $PETSC_MINOR, [PETSc version minor])
+		AC_MSG_RESULT([${PETSC_MAJOR}.${PETSC_MINOR}])
+
+		dnl PETSC_VERSION_DATE_HG=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_DATE_HG" | sed 's/#define PETSC_VERSION_DATE_HG//' | sed 's/ //g' | sed -e 's/\"//g' `
+		PETSC_RELEASE=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_RELEASE" | sed 's/#define PETSC_VERSION_RELEASE//' | sed 's/ //g'`
+
+		AC_MSG_CHECKING(whether PETSc is the development version)
+		dnl if test "x${PETSC_VERSION_DATE_HG}" == "xunknown"; then
+		if test "${PETSC_RELEASE}" == "0"; then
+			AC_DEFINE([_HAVE_PETSCDEV_], [1], [with PETSc-dev])
+			AC_MSG_RESULT([yes])
+		else
+			AC_MSG_RESULT([no])
+		fi
+
+		AC_ARG_WITH(
+			[petsc-arch],
+			AS_HELP_STRING([--with-petsc-arch=DIR], [PETSc arch, necessary for PETSc < 3.0]),
+			[PETSC_ARCH=${withval}],
+			[PETSC_ARCH=""]
+		)
+
+		AC_MSG_CHECKING(for PETSc libraries and header files in ${PETSC_ROOT})
+		dnl To get PETSc's libraries,
+		dnl
+		dnl		cd $ISSM_DIR/externalpackages/petsc/src
+		dnl		make getlinklibs
+		dnl
+		PETSCINCL=" -I${PETSC_ROOT}/include"
+		dnl Add other location (not needed anymore since at least PETSc 3.0)
+		if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/${PETSC_ARCH}/include"; then
+			PETSCINCL+=" ${PETSC_ROOT}/${PETSC_ARCH}/include"
+		fi
+		if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/include/${PETSC_ARCH}"; then
+			PETSCINCL+=" ${PETSC_ROOT}/include/${PETSC_ARCH}"
+		fi
+
+		case "${host_os}" in
+			*cygwin*)
+				if test ${PETSC_MAJOR} -lt 3; then
+					PETSCLIB=-Wl,/LIBPATH:`cygpath -w ${PETSC_ROOT}/lib` -Wl,libpetscksp.lib  -Wl,libpetscdm.lib -Wl,libpetscmat.lib -Wl,libpetscvec.lib -Wl,libpetscsnes.lib  -Wl,libpetscts.lib -Wl,libmpiuni.lib -Wl,libpetsc.lib
+				else
+					PETSCLIB="/link -Wl,/LIBPATH:`cygpath -m ${PETSC_ROOT}/lib` -Wl,libpetsc.lib"
+					PETSCINCL="/I`cygpath -m ${PETSC_ROOT}/include`"
+				fi
+			;;
+			*linux*)
+				if test ${PETSC_MAJOR} -lt 3; then
+					PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lmpiuni -lpetsc"
+				else
+					PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc -ldl"
+					if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then
+						PETSCLIB+=" -lparmetis -lmetis"
+					fi
+				fi
+				if test "x$host_os_version" = "x3.0.101-0.31.1_1.0502.8394-cray_gem_s"; then
+					PETSCLIB="-L${PETSC_ROOT}/lib -lcraypetsc_gnu_real -lmetis"
+				fi
+			;;
+			*darwin*)
+				if test ${PETSC_MAJOR} -lt 3; then
+					PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"
+				else
+					PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc"
+					if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then
+						PETSCLIB+=" -lmetis"
+					fi
+				fi
+			;;
+		esac
+		AC_MSG_RESULT([done])
+		AC_DEFINE([_HAVE_PETSC_], [1], [with PETSc in ISSM src])
+		AC_SUBST([PETSCINCL])
+		AC_SUBST([PETSCLIB])
+	fi
 	dnl }}}
 	dnl MPI{{{
@@ -1167,108 +1271,4 @@
 	AM_CONDITIONAL([MPI], [test "x${HAVE_MPI}" == "xyes"])
 	AC_MSG_RESULT([${HAVE_MPI}])
-	dnl }}}
-	dnl PETSc{{{
-	AC_ARG_WITH(
-		[petsc-dir],
-		AS_HELP_STRING([--with-petsc-dir=DIR], [PETSc root directory, necessary for parallel build]),
-		[PETSC_ROOT=${withval}],
-		[PETSC_ROOT="no"]
-	)
-	AC_MSG_CHECKING([for PETSc])
-	if test "x${PETSC_ROOT}" == "xno"; then
-		HAVE_PETSC=no
-	else
-		HAVE_PETSC=yes
-		if ! test -d "${PETSC_ROOT}"; then
-			AC_MSG_ERROR([PETSc directory provided (${PETSC_ROOT}) does not exist!]);
-		fi
-	fi
-	AC_MSG_RESULT([${HAVE_PETSC}])
-	AM_CONDITIONAL([PETSC], [test "x${HAVE_PETSC}" == "xyes"])
-
-	dnl PETSc libraries and header files
-	if test "x${HAVE_PETSC}" == "xyes"; then
-		AC_MSG_CHECKING(for PETSc version)
-		if ! test -f "${PETSC_ROOT}/include/petscversion.h"; then
-			AC_MSG_ERROR([PETSc not instaled correctly: file (${PETSC_ROOT}/include/petscversion.h) does not exist!]);
-		fi
-		PETSC_MAJOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'`
-		PETSC_MINOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MINOR" | sed 's/#define PETSC_VERSION_MINOR//' | sed 's/ //g'`
-		AC_DEFINE_UNQUOTED(_PETSC_MAJOR_, $PETSC_MAJOR, [PETSc version major])
-		AC_DEFINE_UNQUOTED(_PETSC_MINOR_, $PETSC_MINOR, [PETSc version minor])
-		AC_MSG_RESULT([${PETSC_MAJOR}.${PETSC_MINOR}])
-
-		dnl PETSC_VERSION_DATE_HG=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_DATE_HG" | sed 's/#define PETSC_VERSION_DATE_HG//' | sed 's/ //g' | sed -e 's/\"//g' `
-		PETSC_RELEASE=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_RELEASE" | sed 's/#define PETSC_VERSION_RELEASE//' | sed 's/ //g'`
-
-		AC_MSG_CHECKING(whether PETSc is the development version)
-		dnl if test "x${PETSC_VERSION_DATE_HG}" == "xunknown"; then
-		if test "${PETSC_RELEASE}" == "0"; then
-			AC_DEFINE([_HAVE_PETSCDEV_], [1], [with PETSc-dev])
-			AC_MSG_RESULT([yes])
-		else
-			AC_MSG_RESULT([no])
-		fi
-
-		AC_ARG_WITH(
-			[petsc-arch],
-			AS_HELP_STRING([--with-petsc-arch=DIR], [PETSc arch, necessary for PETSc < 3.0]),
-			[PETSC_ARCH=${withval}],
-			[PETSC_ARCH=""]
-		)
-
-		AC_MSG_CHECKING(for PETSc libraries and header files in ${PETSC_ROOT})
-		dnl To get PETSc's libraries,
-		dnl
-		dnl		cd $ISSM_DIR/externalpackages/petsc/src
-		dnl		make getlinklibs
-		dnl
-		PETSCINCL=" -I${PETSC_ROOT}/include"
-		dnl Add other location (not needed anymore since at least PETSc 3.0)
-		if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/${PETSC_ARCH}/include"; then
-			PETSCINCL+=" ${PETSC_ROOT}/${PETSC_ARCH}/include"
-		fi
-		if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/include/${PETSC_ARCH}"; then
-			PETSCINCL+=" ${PETSC_ROOT}/include/${PETSC_ARCH}"
-		fi
-
-		case "${host_os}" in
-			*cygwin*)
-				if test ${PETSC_MAJOR} -lt 3; then
-					PETSCLIB=-Wl,/LIBPATH:`cygpath -w ${PETSC_ROOT}/lib` -Wl,libpetscksp.lib  -Wl,libpetscdm.lib -Wl,libpetscmat.lib -Wl,libpetscvec.lib -Wl,libpetscsnes.lib  -Wl,libpetscts.lib -Wl,libmpiuni.lib -Wl,libpetsc.lib
-				else
-					PETSCLIB="/link -Wl,/LIBPATH:`cygpath -m ${PETSC_ROOT}/lib` -Wl,libpetsc.lib"
-					PETSCINCL="/I`cygpath -m ${PETSC_ROOT}/include`"
-				fi
-			;;
-			*linux*)
-				if test ${PETSC_MAJOR} -lt 3; then
-					PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lmpiuni -lpetsc"
-				else
-					PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc -ldl"
-					if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then
-						PETSCLIB+=" -lparmetis -lmetis"
-					fi
-				fi
-				if test "x$host_os_version" = "x3.0.101-0.31.1_1.0502.8394-cray_gem_s"; then
-					PETSCLIB="-L${PETSC_ROOT}/lib -lcraypetsc_gnu_real -lmetis"
-				fi
-			;;
-			*darwin*)
-				if test ${PETSC_MAJOR} -lt 3; then
-					PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"
-				else
-					PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc"
-					if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then
-						PETSCLIB+=" -lmetis"
-					fi
-				fi
-			;;
-		esac
-		AC_MSG_RESULT([done])
-		AC_DEFINE([_HAVE_PETSC_], [1], [with PETSc in ISSM src])
-		AC_SUBST([PETSCINCL])
-		AC_SUBST([PETSCLIB])
-	fi
 	dnl }}}
 	dnl SCOTCH{{{
@@ -1599,8 +1599,10 @@
 				if ls ${BLASLAPACK_ROOT}/lib/libopenblas.* 1> /dev/null 2>&1; then
 					BLASLAPACKLIB+=" -lopenblas"
-				elif ls ${BLASLAPACK_ROOT}/lib/liblapack.* 1> /dev/null 2>&1; then
+				elif ls ${BLASLAPACK_ROOT}/lib/libf2clapack.* 1> /dev/null 2>&1; then
+					BLASLAPACKLIB+=" -lf2clapack -lf2cblas"
+				elif ls ${BLASLAPACK_ROOT}/lib/libflapack.* 1> /dev/null 2>&1; then
+					BLASLAPACKLIB+=" -lflapack -lfblas"
+				else
 					BLASLAPACKLIB+=" -llapack -lblas"
-				else
-					BLASLAPACKLIB+=" -lflapack -lfblas"
 				fi
 			;;
@@ -1609,8 +1611,10 @@
 				if ls ${BLASLAPACK_ROOT}/lib/libopenblas.* 1> /dev/null 2>&1; then
 					BLASLAPACKLIB+=" -lopenblas"
-				elif ls ${BLASLAPACK_ROOT}/lib/liblapack.* 1> /dev/null 2>&1; then
+				elif ls ${BLASLAPACK_ROOT}/lib/libf2clapack.* 1> /dev/null 2>&1; then
+					BLASLAPACKLIB+=" -lf2clapack -lf2cblas"
+				elif ls ${BLASLAPACK_ROOT}/lib/libflapack.* 1> /dev/null 2>&1; then
+					BLASLAPACKLIB+=" -lflapack -lfblas"
+				else
 					BLASLAPACKLIB+=" -llapack -lblas"
-				else
-					BLASLAPACKLIB+=" -lflapack -lfblas"
 				fi
 			;;
Index: /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh
===================================================================
--- /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh	(revision 24631)
+++ /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh	(revision 24632)
@@ -34,9 +34,13 @@
 
 echo "Moving MPICH binaries to bin/"
-if [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then
+if [ -f ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec ]; then
+	cp ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec .
+	cp ${ISSM_DIR}/externalpackages/petsc/install/bin/hydra_pmi_proxy .
+elif [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then
 	cp ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec .
 	cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy .
 else
 	echo "MPICH not found"
+	exit 1
 fi
 
@@ -127,4 +131,5 @@
 python -m compileall ${PACKAGE}/bin # Precompile all Python scripts to bytecode
 rm -f ${PACKAGE}/bin/*.py # Remove all Python scripts
+rm -f ${PACKAGE}/bin/generic_static.* # Remove static versions of generic cluster classes
 rm -f ${PACKAGE}/lib/*.a # Remove static libraries from package
 rm -f ${PACKAGE}/lib/*.la # Remove libtool libraries from package
Index: /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh
===================================================================
--- /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh	(revision 24631)
+++ /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh	(revision 24632)
@@ -23,12 +23,15 @@
 echo "Modify generic"
 cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
-rm generic_static.m
 
 echo "Moving MPICH binaries to bin/"
-if [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then
+if [ -f ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec ]; then
+	cp ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec .
+	cp ${ISSM_DIR}/externalpackages/petsc/install/bin/hydra_pmi_proxy .
+elif [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then
 	cp ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec .
-	cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy
+	cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy .
 else
 	echo "MPICH not found"
+	exit 1
 fi
 
@@ -80,4 +83,5 @@
 cp -rf bin examples lib scripts test ${PACKAGE}/
 echo "Cleaning up unneeded/unwanted files"
+rm -f ${PACKAGE}/bin/generic_static.* # Remove static versions of generic cluster classes
 rm -f ${PACKAGE}/lib/*.a # Remove static libraries from package
 rm -f ${PACKAGE}/lib/*.la # Remove libtool libraries from package