Index: /issm/trunk-jpl/configs/config-arm-linux-matlab.sh =================================================================== --- /issm/trunk-jpl/configs/config-arm-linux-matlab.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-arm-linux-matlab.sh (revision 15318) @@ -9,6 +9,6 @@ --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" \ Index: /issm/trunk-jpl/configs/config-linux64-astrid-gia.sh =================================================================== --- /issm/trunk-jpl/configs/config-linux64-astrid-gia.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-linux64-astrid-gia.sh (revision 15318) @@ -15,6 +15,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-linux64-astrid-mpich1.0.sh =================================================================== --- /issm/trunk-jpl/configs/config-linux64-astrid-mpich1.0.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-linux64-astrid-mpich1.0.sh (revision 15318) @@ -12,6 +12,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-linux64-astrid-petsc2.sh =================================================================== --- /issm/trunk-jpl/configs/config-linux64-astrid-petsc2.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-linux64-astrid-petsc2.sh (revision 15318) @@ -5,3 +5,3 @@ #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\ Index: /issm/trunk-jpl/configs/config-linux64-astrid-petsc3.3.sh =================================================================== --- /issm/trunk-jpl/configs/config-linux64-astrid-petsc3.3.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-linux64-astrid-petsc3.3.sh (revision 15318) @@ -12,6 +12,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-linux64-astrid-petscdev.sh =================================================================== --- /issm/trunk-jpl/configs/config-linux64-astrid-petscdev.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-linux64-astrid-petscdev.sh (revision 15318) @@ -10,6 +10,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-linux64-astrid.sh =================================================================== --- /issm/trunk-jpl/configs/config-linux64-astrid.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-linux64-astrid.sh (revision 15318) @@ -15,6 +15,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-linux64-cloud.sh =================================================================== --- /issm/trunk-jpl/configs/config-linux64-cloud.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-linux64-cloud.sh (revision 15318) @@ -12,6 +12,6 @@ --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/ \ Index: /issm/trunk-jpl/configs/config-linux64-larsen-petsc3.2.sh =================================================================== --- /issm/trunk-jpl/configs/config-linux64-larsen-petsc3.2.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-linux64-larsen-petsc3.2.sh (revision 15318) @@ -15,6 +15,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-linux64-murdo-nopetsc.sh =================================================================== --- /issm/trunk-jpl/configs/config-linux64-murdo-nopetsc.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-linux64-murdo-nopetsc.sh (revision 15318) @@ -3,6 +3,6 @@ ./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 \ Index: /issm/trunk-jpl/configs/config-linux64-murdo.sh =================================================================== --- /issm/trunk-jpl/configs/config-linux64-murdo.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-linux64-murdo.sh (revision 15318) @@ -9,6 +9,6 @@ --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\ Index: /issm/trunk-jpl/configs/config-linux64-ubuntu64.sh =================================================================== --- /issm/trunk-jpl/configs/config-linux64-ubuntu64.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-linux64-ubuntu64.sh (revision 15318) @@ -7,6 +7,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-macosx-snowleopard-bothapis.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx-snowleopard-bothapis.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx-snowleopard-bothapis.sh (revision 15318) @@ -11,6 +11,6 @@ --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" \ Index: /issm/trunk-jpl/configs/config-macosx-snowleopard-python.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx-snowleopard-python.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx-snowleopard-python.sh (revision 15318) @@ -10,6 +10,6 @@ --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" \ Index: /issm/trunk-jpl/configs/config-macosx32-mathieu.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx32-mathieu.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx32-mathieu.sh (revision 15318) @@ -15,6 +15,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-macosx32-ogive.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx32-ogive.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx32-ogive.sh (revision 15318) @@ -10,6 +10,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-macosx64-basile.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-basile.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-basile.sh (revision 15318) @@ -10,6 +10,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-macosx64-chris-bothapis.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-chris-bothapis.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-chris-bothapis.sh (revision 15318) @@ -11,6 +11,6 @@ --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" \ Index: /issm/trunk-jpl/configs/config-macosx64-chris-python.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-chris-python.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-chris-python.sh (revision 15318) @@ -10,6 +10,6 @@ --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" \ Index: /issm/trunk-jpl/configs/config-macosx64-chris.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-chris.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-chris.sh (revision 15318) @@ -10,6 +10,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-macosx64-larour-gia.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-larour-gia.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-larour-gia.sh (revision 15318) @@ -13,6 +13,6 @@ --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" \ Index: /issm/trunk-jpl/configs/config-macosx64-larour.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-larour.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-larour.sh (revision 15318) @@ -13,6 +13,6 @@ --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" \ Index: /issm/trunk-jpl/configs/config-macosx64-lion-helene.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-lion-helene.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-lion-helene.sh (revision 15318) @@ -11,6 +11,6 @@ --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" \ Index: /issm/trunk-jpl/configs/config-macosx64-mathieu.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-mathieu.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-mathieu.sh (revision 15318) @@ -10,6 +10,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-macosx64-mlion-mathieu.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-mlion-mathieu.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-mlion-mathieu.sh (revision 15318) @@ -1,6 +1,6 @@ #!/bin/sh -#mpich 1.5 -#petsc 3.3 +#mpich 3.0.4 +#petsc 3.4 #python 2.7 @@ -11,20 +11,16 @@ --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 " \ Index: /issm/trunk-jpl/configs/config-macosx64-nicole.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-nicole.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-nicole.sh (revision 15318) @@ -11,6 +11,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-macosx64-ogive.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-ogive.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-ogive.sh (revision 15318) @@ -14,6 +14,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-macosx64-simple.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-simple.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-simple.sh (revision 15318) @@ -9,6 +9,6 @@ --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" \ Index: /issm/trunk-jpl/configs/config-macosx64-sophie.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64-sophie.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64-sophie.sh (revision 15318) @@ -14,6 +14,6 @@ --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 \ Index: /issm/trunk-jpl/configs/config-macosx64.sh =================================================================== --- /issm/trunk-jpl/configs/config-macosx64.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-macosx64.sh (revision 15318) @@ -12,6 +12,6 @@ --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" \ Index: /issm/trunk-jpl/configs/config-walgreen.sh =================================================================== --- /issm/trunk-jpl/configs/config-walgreen.sh (revision 15317) +++ /issm/trunk-jpl/configs/config-walgreen.sh (revision 15318) @@ -7,6 +7,6 @@ --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/" \