Index: /issm/trunk-jpl/configs/config-linux64-astrid-mpich1.0.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-astrid-mpich1.0.sh	(revision 12145)
+++ /issm/trunk-jpl/configs/config-linux64-astrid-mpich1.0.sh	(revision 12145)
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+#External packages versions:
+#petsc 3.1 or 3.2
+#mpich 1.0.2
+
+./configure \
+ --prefix=$ISSM_TIER \
+ --with-matlab-dir=$MATLAB_DIR \
+ --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
+ --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
+ --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
+ --with-tao-dir=$ISSM_TIER/externalpackages/tao/install \
+ --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include  \
+ --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich " \
+ --with-petsc-arch=$ISSM_ARCH \
+ --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
+ --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
+ --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
+ --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
+ --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
+ --with-scotch-dir="$ISSM_TIER/externalpackages/scotch/install" \
+ --with-chaco-dir="$ISSM_TIER/externalpackages/chaco/install" \
+ --with-shapelib-dir="$ISSM_TIER/externalpackages/shapelib/install" \
+ --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 \
+ --enable-debugging
Index: sm/trunk-jpl/configs/config-linux64-astrid-mpich1.4.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-astrid-mpich1.4.sh	(revision 12144)
+++ 	(revision )
@@ -1,31 +1,0 @@
-#!/bin/sh
-
-#External packages versions:
-#petsc 3.1 or 3.2
-#mpich 1.4
-
-./configure \
- --prefix=$ISSM_TIER \
- --with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
- --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-tao-dir=$ISSM_TIER/externalpackages/tao/install \
- --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
- --with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
- --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
- --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scotch-dir="$ISSM_TIER/externalpackages/scotch/install" \
- --with-chaco-dir="$ISSM_TIER/externalpackages/chaco/install" \
- --with-shapelib-dir="$ISSM_TIER/externalpackages/shapelib/install" \
- --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 \
- --enable-debugging
Index: /issm/trunk-jpl/configs/config-linux64-astrid.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-astrid.sh	(revision 12144)
+++ /issm/trunk-jpl/configs/config-linux64-astrid.sh	(revision 12145)
@@ -3,5 +3,5 @@
 #External packages versions:
 #petsc 3.1 or 3.2
-#mpich 1.0.2
+#mpich 1.4
 
 ./configure \
@@ -13,5 +13,5 @@
  --with-tao-dir=$ISSM_TIER/externalpackages/tao/install \
  --with-mpi-include=$ISSM_TIER/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich " \
+ --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \