Index: /issm/trunk-jpl/externalpackages/mpich/install-3.0-linux64-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich/install-3.0-linux64-static.sh	(revision 22756)
+++ /issm/trunk-jpl/externalpackages/mpich/install-3.0-linux64-static.sh	(revision 22757)
@@ -1,4 +1,8 @@
 #!/bin/bash
 set -eu
+
+export CXXFLAGS="-fPIC"
+export CFLAGS="-fPIC"
+export FFLAGS="-fPIC"
 
 #Some cleanup
@@ -16,13 +20,8 @@
 rm -rf mpich-3.0.4
 
-export CXXFLAGS='-fPIC'
-export CFLAGS='-fPIC'
-export FFLAGS='-fPIC'
-
 #Configure mpich
 cd src
 ./configure \
-	--prefix="$ISSM_DIR/externalpackages/mpich/install" \
-	--disable-shared \
+	--prefix="$ISSM_DIR/externalpackages/mpich/install"
 
 #Compile mpich (this new version supports parallel make)
Index: /issm/trunk-jpl/externalpackages/mpich/install-3.2-linux64-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich/install-3.2-linux64-static.sh	(revision 22756)
+++ /issm/trunk-jpl/externalpackages/mpich/install-3.2-linux64-static.sh	(revision 22757)
@@ -19,6 +19,5 @@
 cd src
 ./configure \
-	--prefix="$ISSM_DIR/externalpackages/mpich/install" \
-	--disable-shared \
+	--prefix="$ISSM_DIR/externalpackages/mpich/install"
 
 #Compile mpich (this new version supports parallel make)
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.6-linux64-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.6-linux64-static.sh	(revision 22756)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.6-linux64-static.sh	(revision 22757)
@@ -30,6 +30,10 @@
 	--download-fblaslapack=1 \
 	--download-scalapack=1 \
-	--with-pic=1
-
+	--CFLAGS="-fPIC" \
+	--CC_LINKER_FLAGS="-fPIC" \
+	--CXXFLAGS="-fPIC" \
+	--FFLAGS="-fPIC" \
+	--FC_LINKER_FLAGS="-fPIC"
+	
 #Compile and intall
 make
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.7-linux64-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.7-linux64-static.sh	(revision 22756)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.7-linux64-static.sh	(revision 22757)
@@ -30,5 +30,7 @@
 	--download-fblaslapack=1 \
 	--download-scalapack=1 \
-	--with-pic=1
+	--COPTFLAGS="-fPIC" \
+	--CXXOPTFLAGS="-fPIC" \
+	--FOPTFLAGS="-fPIC"
 
 #Compile and intall
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64-static.sh	(revision 22756)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64-static.sh	(revision 22757)
@@ -29,5 +29,8 @@
 	--download-mumps=1 \
 	--download-fblaslapack=1 \
-	--download-scalapack=1
+	--download-scalapack=1 \
+	--COPTFLAGS="-fPIC" \
+	--CXXOPTFLAGS="-fPIC" \
+	--FOPTFLAGS="-fPIC"
 
 #Compile and intall
Index: /issm/trunk-jpl/jenkins/jenkins.sh
===================================================================
--- /issm/trunk-jpl/jenkins/jenkins.sh	(revision 22756)
+++ /issm/trunk-jpl/jenkins/jenkins.sh	(revision 22757)
@@ -296,7 +296,7 @@
 	cd $ISSM_DIR/test/NightlyRun
 	if [ "$OS" = "win" ]; then
-		$MATLAB_PATH/bin/matlab -nojvm -nosplash -r "addpath $ISSM_DIR_WIN/src/m/dev; devpath; addpath $ISSM_DIR_WIN/nightlylog/; matlab_run$i" -logfile $ISSM_DIR_WIN/nightlylog/matlab_log$i.log &
-	else
-		$MATLAB_PATH/bin/matlab -nojvm -nosplash -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; matlab_run$i" -logfile $ISSM_DIR/nightlylog/matlab_log$i.log &
+		$MATLAB_PATH/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "addpath $ISSM_DIR_WIN/src/m/dev; devpath; addpath $ISSM_DIR_WIN/nightlylog/; matlab_run$i" -logfile $ISSM_DIR_WIN/nightlylog/matlab_log$i.log &
+	else
+		$MATLAB_PATH/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; matlab_run$i" -logfile $ISSM_DIR/nightlylog/matlab_log$i.log &
 	fi
 done
@@ -470,5 +470,5 @@
 				echo 'end' >> $FILE
 
-				$MATLAB_PATH/bin/matlab -nosplash -nodisplay -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; runme" -logfile $ISSM_DIR/nightlylog/$LOG_FILE
+				$MATLAB_PATH/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; runme" -logfile $ISSM_DIR/nightlylog/$LOG_FILE
 				echo "starting: $(basename $dir)" >> $ISSM_DIR/nightlylog/matlab_log_examples.log
 				cat $ISSM_DIR/nightlylog/$LOG_FILE >> $ISSM_DIR/nightlylog/matlab_log_examples.log
Index: /issm/trunk-jpl/jenkins/macosx_pine-island_dakota_static
===================================================================
--- /issm/trunk-jpl/jenkins/macosx_pine-island_dakota_static	(revision 22756)
+++ /issm/trunk-jpl/jenkins/macosx_pine-island_dakota_static	(revision 22757)
@@ -14,8 +14,8 @@
 	--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 -lmpi " \
+	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich -lmpl -lpmpich" \
 	--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-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 \
@@ -23,5 +23,5 @@
 	--with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
 	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
-	--with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
+	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/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-numthreads=4'
@@ -39,7 +39,7 @@
 						cmake        install.sh
 						chaco        install-macosx64.sh
-						mpich        install-3.2-macosx64-static.sh
+						mpich        install-3.0-macosx64-static.sh
 						m1qn3        install.sh
-						petsc        install-3.7-macosx64-static.sh
+						petsc        install-3.6-macosx64-static.sh
 						triangle     install-macosx64.sh
 						boost        install-1.55-macosx-el_capitan.sh
Index: /issm/trunk-jpl/jenkins/macosx_pine-island_static
===================================================================
--- /issm/trunk-jpl/jenkins/macosx_pine-island_static	(revision 22756)
+++ /issm/trunk-jpl/jenkins/macosx_pine-island_static	(revision 22757)
@@ -15,8 +15,8 @@
 	--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 -lmpi" \
-	--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-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich -lmpl -lpmpich" \
+	--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 \
@@ -36,7 +36,7 @@
 EXTERNALPACKAGES="autotools    install.sh
 						cmake        install.sh
-						mpich        install-3.2-macosx64-static.sh
+						mpich        install-3.0-macosx64-static.sh
 						m1qn3        install.sh
-						petsc        install-3.7-macosx64-static.sh
+						petsc        install-3.6-macosx64-static.sh
 						triangle     install-macosx64.sh
 						shell2junit  install.sh"
Index: /issm/trunk-jpl/packagers/macosx-dakota/package.sh
===================================================================
--- /issm/trunk-jpl/packagers/macosx-dakota/package.sh	(revision 22756)
+++ /issm/trunk-jpl/packagers/macosx-dakota/package.sh	(revision 22757)
@@ -11,5 +11,5 @@
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
-/Applications/MATLAB_R2015b.app/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
+/Applications/MATLAB_R2015b.app/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
 
 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
Index: /issm/trunk-jpl/packagers/macosx/package.sh
===================================================================
--- /issm/trunk-jpl/packagers/macosx/package.sh	(revision 22756)
+++ /issm/trunk-jpl/packagers/macosx/package.sh	(revision 22757)
@@ -11,5 +11,5 @@
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
-$MATLAB_DIR/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
+/Applications/MATLAB_R2015b.app/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
 
 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
Index: /issm/trunk-jpl/packagers/ubuntu/package.sh
===================================================================
--- /issm/trunk-jpl/packagers/ubuntu/package.sh	(revision 22756)
+++ /issm/trunk-jpl/packagers/ubuntu/package.sh	(revision 22757)
@@ -5,9 +5,11 @@
 cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
 echo "move mpiexec to bin" 
+cp ../externalpackages/mpich/install/bin/mpiexec .
+cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
 
 #Check that test101 runs
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
-$MATLAB_DIR/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
+/usr/local/MATLAB/R2015a/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
 
 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
