Changeset 15318

Timestamp:

06/22/13 11:22:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: mpich2 is now in externalpackages/mpich

Location:

issm/trunk-jpl/configs

Files:

• config-arm-linux-matlab.sh (modified) (1 diff)
• config-linux64-astrid-gia.sh (modified) (1 diff)
• config-linux64-astrid-mpich1.0.sh (modified) (1 diff)
• config-linux64-astrid-petsc2.sh (modified) (1 diff)
• config-linux64-astrid-petsc3.3.sh (modified) (1 diff)
• config-linux64-astrid-petscdev.sh (modified) (1 diff)
• config-linux64-astrid.sh (modified) (1 diff)
• config-linux64-cloud.sh (modified) (1 diff)
• config-linux64-larsen-petsc3.2.sh (modified) (1 diff)
• config-linux64-murdo-nopetsc.sh (modified) (1 diff)
• config-linux64-murdo.sh (modified) (1 diff)
• config-linux64-ubuntu64.sh (modified) (1 diff)
• config-macosx-snowleopard-bothapis.sh (modified) (1 diff)
• config-macosx-snowleopard-python.sh (modified) (1 diff)
• config-macosx32-mathieu.sh (modified) (1 diff)
• config-macosx32-ogive.sh (modified) (1 diff)
• config-macosx64-basile.sh (modified) (1 diff)
• config-macosx64-chris-bothapis.sh (modified) (1 diff)
• config-macosx64-chris-python.sh (modified) (1 diff)
• config-macosx64-chris.sh (modified) (1 diff)
• config-macosx64-larour-gia.sh (modified) (1 diff)
• config-macosx64-larour.sh (modified) (1 diff)
• config-macosx64-lion-helene.sh (modified) (1 diff)
• config-macosx64-mathieu.sh (modified) (1 diff)
• config-macosx64-mlion-mathieu.sh (modified) (2 diffs)
• config-macosx64-nicole.sh (modified) (1 diff)
• config-macosx64-ogive.sh (modified) (1 diff)
• config-macosx64-simple.sh (modified) (1 diff)
• config-macosx64-sophie.sh (modified) (1 diff)
• config-macosx64.sh (modified) (1 diff)
• config-walgreen.sh (modified) (1 diff)

issm/trunk-jpl/configs/config-arm-linux-matlab.sh

@@ -9 +9 @@
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
         --with-math-lib="/usr/lib/libm.dylib" \

issm/trunk-jpl/configs/config-linux64-astrid-gia.sh

@@ -15 +15 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \

issm/trunk-jpl/configs/config-linux64-astrid-mpich1.0.sh

@@ -12 +12 @@
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich " \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \

issm/trunk-jpl/configs/config-linux64-astrid-petsc2.sh

@@ -5 +5 @@
 #mpich 1.0.2
 
-./configure --prefix=$ISSM_DIR --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2" --with-numthreads=32 --with-scotch-dir=$ISSM_DIR/externalpackages/scotch/install --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install --enable-debugging --with-shapelib-dir=$ISSM_DIR/externalpackages/shapelib/install\
+./configure --prefix=$ISSM_DIR --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2" --with-numthreads=32 --with-scotch-dir=$ISSM_DIR/externalpackages/scotch/install --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install --enable-debugging --with-shapelib-dir=$ISSM_DIR/externalpackages/shapelib/install\

issm/trunk-jpl/configs/config-linux64-astrid-petsc3.3.sh

@@ -12 +12 @@
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \

issm/trunk-jpl/configs/config-linux64-astrid-petscdev.sh

@@ -10 +10 @@
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \

issm/trunk-jpl/configs/config-linux64-astrid.sh

@@ -15 +15 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \

issm/trunk-jpl/configs/config-linux64-cloud.sh

@@ -12 +12 @@
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \

issm/trunk-jpl/configs/config-linux64-larsen-petsc3.2.sh

@@ -15 +15 @@
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \

issm/trunk-jpl/configs/config-linux64-murdo-nopetsc.sh

@@ -3 +3 @@
 ./configure \
  --prefix=$ISSM_DIR \
- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
  --with-matlab-dir=$MATLAB_DIR \
  --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \

issm/trunk-jpl/configs/config-linux64-murdo.sh

@@ -9 +9 @@
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-python-dir=$ISSM_DIR/externalpackages/python/install\

issm/trunk-jpl/configs/config-linux64-ubuntu64.sh

@@ -7 +7 @@
  --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
- --with-mpi-include="/usr/lib/mpich2/include" \
- --with-mpi-libflags="-L/usr/lib/mpich2/lib -lmpich -lmpl -ldl" \
+ --with-mpi-include="/usr/lib/mpich/include" \
+ --with-mpi-libflags="-L/usr/lib/mpich/lib -lmpich -lmpl -ldl" \
  --with-petsc-arch=$ISSM_ARCH \
  --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \

issm/trunk-jpl/configs/config-macosx-snowleopard-bothapis.sh

@@ -11 +11 @@
         --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include/numpy\
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-fortran-lib="/usr/local/gfortran/lib/gcc/x86_64-apple-darwin10/4.6.2/libgfortran.a" \
         --with-math-lib="/usr/lib/libm.dylib" \

issm/trunk-jpl/configs/config-macosx-snowleopard-python.sh

@@ -10 +10 @@
         --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include/numpy\
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-fortran-lib="/usr/local/gfortran/lib/gcc/x86_64-apple-darwin10/4.6.2/libgfortran.a" \
         --with-math-lib="/usr/lib/libm.dylib" \

issm/trunk-jpl/configs/config-macosx32-mathieu.sh

@@ -15 +15 @@
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-petsc-arch=$ISSM_ARCH \
         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \

issm/trunk-jpl/configs/config-macosx32-ogive.sh

@@ -10 +10 @@
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-petsc-arch=$ISSM_ARCH \
         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \

issm/trunk-jpl/configs/config-macosx64-basile.sh

@@ -10 +10 @@
         --with-metis-dir="$ISSM_DIR/externalpackages/petsc/src/externalpackages/metis-5.0.2-p3" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
-        --with-mpi-include="$ISSM_DIR/externalpackages/mpich2/install/include"  \
-        --with-mpi-libflags="$ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include="$ISSM_DIR/externalpackages/mpich/install/include"  \
+        --with-mpi-libflags="$ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-petsc-arch=$ISSM_ARCH \
         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \

issm/trunk-jpl/configs/config-macosx64-chris-bothapis.sh

@@ -11 +11 @@
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
         --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \

issm/trunk-jpl/configs/config-macosx64-chris-python.sh

@@ -10 +10 @@
         --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/numpy\
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
         --with-fortran-lib="/usr/local/gfortran/lib/gcc/x86_64-apple-darwin10/4.6.2/libgfortran.a" \

issm/trunk-jpl/configs/config-macosx64-chris.sh

@@ -10 +10 @@
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-petsc-arch=$ISSM_ARCH \
         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \

issm/trunk-jpl/configs/config-macosx64-larour-gia.sh

@@ -13 +13 @@
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
         --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \

issm/trunk-jpl/configs/config-macosx64-larour.sh

@@ -13 +13 @@
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
         --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \

issm/trunk-jpl/configs/config-macosx64-lion-helene.sh

@@ -11 +11 @@
         --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/numpy\
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
         --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \

issm/trunk-jpl/configs/config-macosx64-mathieu.sh

@@ -10 +10 @@
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-petsc-arch=$ISSM_ARCH \
         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \

issm/trunk-jpl/configs/config-macosx64-mlion-mathieu.sh

@@ -1 +1 @@
 #!/bin/sh
 
-#mpich  1.5
-#petsc  3.3
+#mpich  3.0.4
+#petsc  3.4
 #python 2.7
 
@@ -11 +11 @@
         --with-python-dir="$ISSM_DIR/externalpackages/python/install" \
         --with-python-numpy-dir="$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/numpy" \
-        --with-mpi-include="$ISSM_DIR/externalpackages/mpich2/install/include"  \
-        --with-mpi-libflags="$ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
-        --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
-        --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
-        --with-graphics-lib="-L/usr/X11R6/lib -lX11" \
+        --with-mpi-include="$ISSM_DIR/externalpackages/mpich/install/include"  \
+        --with-mpi-libflags="$ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
         --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
         --with-petsc-arch="$ISSM_ARCH" \
         --with-blas-lapack-dir="$ISSM_DIR/externalpackages/petsc/install" \
-        --with-blacs-dir="$ISSM_DIR/externalpackages/petsc/install/" \
         --with-scalapack-dir="$ISSM_DIR/externalpackages/petsc/install/" \
         --with-mumps-dir="$ISSM_DIR/externalpackages/petsc/install/" \
         --with-metis-dir="$ISSM_DIR/externalpackages/petsc/src/externalpackages/metis-5.0.2-p3" \
         --with-shapelib-dir="$ISSM_DIR/externalpackages/shapelib/install" \
+        --with-fortran-lib="-L/usr/local/gfortran/lib/ -lgfortran"\
+        --with-graphics-lib="-L/usr/X11R6/lib -lX11" \
         --with-numthreads=16\
         --enable-debugging
-
-        #--with-mpi-libflags="-L/$ISSM_DIR/externalpackages/mpich2/install/lib/ -lpmpich -lmpich -lmpl " \

issm/trunk-jpl/configs/config-macosx64-nicole.sh

@@ -11 +11 @@
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-petsc-arch=$ISSM_ARCH \
         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \

issm/trunk-jpl/configs/config-macosx64-ogive.sh

@@ -14 +14 @@
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-petsc-arch=$ISSM_ARCH \
         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \

issm/trunk-jpl/configs/config-macosx64-simple.sh

@@ -9 +9 @@
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
         --with-math-lib="/usr/lib/libm.dylib" \

issm/trunk-jpl/configs/config-macosx64-sophie.sh

@@ -14 +14 @@
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-petsc-arch=$ISSM_ARCH \
         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \

issm/trunk-jpl/configs/config-macosx64.sh

@@ -12 +12 @@
         --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
         --with-metis-dir="$ISSM_DIR/externalpackages/metis/install" \
-        --with-mpi-include="$ISSM_DIR/externalpackages/mpich2/install/include" \
-        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+        --with-mpi-include="$ISSM_DIR/externalpackages/mpich/install/include" \
+        --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
         --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \

issm/trunk-jpl/configs/config-walgreen.sh

@@ -7 +7 @@
  --with-petsc-arch=$ISSM_ARCH \
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
  --with-mkl-dir="/opt/intel/mkl/10.0.1.014/lib/64/lib/" \
  --with-mumps-dir="$ISSM_DIR/externalpackages/petsc/install/" \