Index: /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-linux64-astrid.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-linux64-astrid.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-linux64-astrid.sh	(revision 15319)
@@ -18,5 +18,5 @@
 ./config/configure.py  \
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
-	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
 	--PETSC_ARCH=linux-gnu-amd64 \
 	--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install" \
@@ -29,5 +29,5 @@
 	--download-blas=yes \
 	--download-f-blas-lapack=yes \
-	--FFLAGS=-I$ISSM_DIR/externalpackages/mpich2/install/include \
+	--FFLAGS=-I$ISSM_DIR/externalpackages/mpich/install/include \
 	--download-plapack=yes \
 	--COPTFLAGS="-march=opteron -O2" \
Index: /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-eric.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-eric.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-eric.sh	(revision 15319)
@@ -22,5 +22,5 @@
 	./config/configure.py  \
 		--prefix="$ISSM_DIR/externalpackages/petsc/install" \
-		--with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+		--with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
 		--PETSC_ARCH=macosx-gnu \
 		--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install" \
@@ -33,5 +33,5 @@
 		--download-blas=yes \
 		--download-f-blas-lapack=yes \
-		--FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -L$ISSM_DIR/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran  -fPIC -arch i386" \
+		--FFLAGS="-I$ISSM_DIR/externalpackages/mpich/install/include -L$ISSM_DIR/externalpackages/mpich/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran  -fPIC -arch i386" \
 		--download-plapack=yes \
 		--CXXFLAGS=" -fPIC -arch i386" \
@@ -48,5 +48,5 @@
 	./config/configure.py  \
 		--prefix="$ISSM_DIR/externalpackages/petsc/install" \
-		--with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+		--with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
 		--PETSC_ARCH=macosx-gnu \
 		--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install" \
@@ -59,5 +59,5 @@
 		--download-blas=yes \
 		--download-f-blas-lapack=yes \
-		--FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -L$ISSM_DIR/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran  -fPIC -arch i386" \
+		--FFLAGS="-I$ISSM_DIR/externalpackages/mpich/install/include -L$ISSM_DIR/externalpackages/mpich/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran  -fPIC -arch i386" \
 		--download-plapack=yes \
 		--CXXFLAGS=" -fPIC -arch i386" \
Index: /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh	(revision 15319)
@@ -17,5 +17,5 @@
 cd install
 ./config/configure.py  --prefix="$ISSM_DIR/externalpackages/petsc/install" \
-	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
 	--PETSC_ARCH=macosx-gnu \
 	--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install" \
@@ -28,5 +28,5 @@
 	--download-blas=yes \
 	--download-f-blas-lapack=yes \
-	--FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -L$ISSM_DIR/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran" \
+	--FFLAGS="-I$ISSM_DIR/externalpackages/mpich/install/include -L$ISSM_DIR/externalpackages/mpich/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran" \
 	--download-plapack=yes
 
Index: /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx64.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx64.sh	(revision 15319)
@@ -20,5 +20,5 @@
   --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
   --PETSC_ARCH=macosx-gnu \
-  --with-mpi-dir="$ISSM_DIR/externalpackages/mpich2/install" \
+  --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \
   --with-debugging=0 \
   --with-shared-libraries=0 \
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.1-linux64-astrid.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.1-linux64-astrid.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.1-linux64-astrid.sh	(revision 15319)
@@ -18,5 +18,5 @@
 ./config/configure.py \
  --prefix="$ISSM_DIR/externalpackages/petsc/install" \
- --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
  --PETSC_ARCH=linux-gnu-amd64 \
  --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
@@ -29,5 +29,5 @@
  --download-f-blas-lapack=yes \
  --download-parmetis=yes \
- --FFLAGS=-I$ISSM_DIR/externalpackages/mpich2/install/include \
+ --FFLAGS=-I$ISSM_DIR/externalpackages/mpich/install/include \
  --download-plapack=yes \
  --COPTFLAGS="-march=opteron -O2" \
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-mathieu.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-mathieu.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-mathieu.sh	(revision 15319)
@@ -20,5 +20,5 @@
  --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
  --PETSC_ARCH=macosx-gnu \
- --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
  --with-debugging=0 \
  --with-shared=0 \
@@ -29,5 +29,5 @@
  --download-f-blas-lapack=yes \
  --download-plapack=yes \
- --FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -arch i386" \
+ --FFLAGS="-I$ISSM_DIR/externalpackages/mpich/install/include -arch i386" \
  --COPTFLAGS="-march=opteron -O2 -arch i386" \
  --FOPTFLAGS="-march=opteron -O2 -arch i386" \
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-ogive.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-ogive.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-ogive.sh	(revision 15319)
@@ -19,5 +19,5 @@
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
 	--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
-	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
 	--PETSC_ARCH=macosx-gnu \
 	--with-fc=/usr/local/bin/gfortran \
@@ -34,5 +34,5 @@
 	--FOPTFLAGS="-march=opteron -O2 " \
 	--CXXOPTFLAGS="-march=opteron -O2 " \
-	--FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -L$ISSM_DIR/externalpackages/mpich2/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran " 
+	--FFLAGS="-I$ISSM_DIR/externalpackages/mpich/install/include -L$ISSM_DIR/externalpackages/mpich/install/lib -L/usr/local/bin -lmpich -lpmpich -lgfortran " 
 
 #Compile petsc and install it
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.1-ubuntu64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.1-ubuntu64.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.1-ubuntu64.sh	(revision 15319)
@@ -18,5 +18,5 @@
 ./config/configure.py \
  --prefix="$ISSM_DIR/externalpackages/petsc/install" \
- --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
  --PETSC_ARCH=linux-gnu\
  --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
@@ -29,5 +29,5 @@
  --download-f-blas-lapack=yes \
  --download-parmetis=yes \
- --FFLAGS=-I$ISSM_DIR/externalpackages/mpich2/install/include \
+ --FFLAGS=-I$ISSM_DIR/externalpackages/mpich/install/include \
  --download-plapack=yes \
  --COPTFLAGS="-O2" \
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh	(revision 15319)
@@ -33,5 +33,5 @@
 # --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
 # --PETSC_ARCH=macosx-gnu \
-# --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+# --with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
 # --with-debugging=0 \
 # --with-shared=0 \
@@ -42,5 +42,5 @@
 # --download-f-blas-lapack=yes \
 # --download-plapack=yes \
-# --FFLAGS="-I$ISSM_DIR/externalpackages/mpich2/install/include -arch i386" \
+# --FFLAGS="-I$ISSM_DIR/externalpackages/mpich/install/include -arch i386" \
 # --COPTFLAGS="-march=opteron -O2 -arch i386" \
 # --FOPTFLAGS="-march=opteron -O2 -arch i386" \
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.2-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.2-linux64.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.2-linux64.sh	(revision 15319)
@@ -18,5 +18,5 @@
 ./config/configure.py \
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
-	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
 	--with-clanguage=C++ \
 	--PETSC_ARCH=linux-gnu-amd64 \
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.2-macosx64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.2-macosx64.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.2-macosx64.sh	(revision 15319)
@@ -20,5 +20,5 @@
   --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
   --PETSC_ARCH="macosx-gnu" \
-  --with-mpi-dir="$ISSM_DIR/externalpackages/mpich2/install" \
+  --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \
   --with-debugging=0 \
   --with-shared-libraries=1 \
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.2-ubuntu64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.2-ubuntu64.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.2-ubuntu64.sh	(revision 15319)
@@ -18,5 +18,5 @@
 ./config/configure.py \
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
-	--with-mpi-dir=/usr/lib/mpich2 \
+	--with-mpi-dir=/usr/lib/mpich \
 	--with-clanguage=C++ \
 	--PETSC_ARCH=linux-gnu-amd64 \
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.3-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.3-linux64.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.3-linux64.sh	(revision 15319)
@@ -18,5 +18,5 @@
 ./config/configure.py \
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
-	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
 	--PETSC_ARCH=linux-gnu-amd64 \
 	--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.3-macosx64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.3-macosx64.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.3-macosx64.sh	(revision 15319)
@@ -18,5 +18,5 @@
 ./config/configure.py \
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
-	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+	--with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
 	--PETSC_ARCH="macosx-gnu" \
 	--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.3-walgreen.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.3-walgreen.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.3-walgreen.sh	(revision 15319)
@@ -18,5 +18,5 @@
  --prefix="$ISSM_DIR/externalpackages/petsc/install" \
  --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
- --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \
+ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich/install \
  --with-debugging=0 \
  --with-shared-libraries=1 \
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.4-macosx64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.4-macosx64.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.4-macosx64.sh	(revision 15319)
@@ -18,5 +18,5 @@
 ./config/configure.py \
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
-	--with-mpi-dir="$ISSM_DIR/externalpackages/mpich2/install" \
+	--with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \
 	--PETSC_ARCH="macosx-gnu" \
 	--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
Index: /issm/trunk-jpl/externalpackages/petsc/install-dev-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-dev-linux64.sh	(revision 15318)
+++ /issm/trunk-jpl/externalpackages/petsc/install-dev-linux64.sh	(revision 15319)
@@ -33,5 +33,5 @@
 	./config/configure.py \
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
-	--with-mpi-dir="$ISSM_DIR/externalpackages/mpich2/install" \
+	--with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \
 	--with-clanguage=C++ \
 	--PETSC_ARCH=linux-gnu-amd64 \