Changeset 15319

Timestamp:

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

Author:

Mathieu Morlighem

Message:

CHG: mpich2 is now in externalpackages/mpich

Location:

issm/trunk-jpl/externalpackages/petsc

Files:

• install-2.3.2-linux64-astrid.sh (modified) (2 diffs)
• install-2.3.2-macosx32-eric.sh (modified) (4 diffs)
• install-2.3.2-macosx32-ogive.sh (modified) (2 diffs)
• install-2.3.2-macosx64.sh (modified) (1 diff)
• install-3.1-linux64-astrid.sh (modified) (2 diffs)
• install-3.1-macosx32-mathieu.sh (modified) (2 diffs)
• install-3.1-macosx32-ogive.sh (modified) (2 diffs)
• install-3.1-ubuntu64.sh (modified) (2 diffs)
• install-3.1-win7.sh (modified) (2 diffs)
• install-3.2-linux64.sh (modified) (1 diff)
• install-3.2-macosx64.sh (modified) (1 diff)
• install-3.2-ubuntu64.sh (modified) (1 diff)
• install-3.3-linux64.sh (modified) (1 diff)
• install-3.3-macosx64.sh (modified) (1 diff)
• install-3.3-walgreen.sh (modified) (1 diff)
• install-3.4-macosx64.sh (modified) (1 diff)
• install-dev-linux64.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/petsc/install-2.3.2-linux64-astrid.sh

@@ -18 +18 @@
 ./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 +29 @@
         --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" \

issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-eric.sh

@@ -22 +22 @@
         ./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 +33 @@
                 --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 +48 @@
         ./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 +59 @@
                 --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" \

issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh

@@ -17 +17 @@
 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 +28 @@
         --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
 

issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx64.sh

@@ -20 +20 @@
   --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 \

issm/trunk-jpl/externalpackages/petsc/install-3.1-linux64-astrid.sh

@@ -18 +18 @@
 ./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 +29 @@
  --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" \

issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-mathieu.sh

@@ -20 +20 @@
  --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 +29 @@
  --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" \

issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-ogive.sh

@@ -19 +19 @@
         --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 +34 @@
         --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

issm/trunk-jpl/externalpackages/petsc/install-3.1-ubuntu64.sh

@@ -18 +18 @@
 ./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 +29 @@
  --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" \

issm/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh

@@ -33 +33 @@
 # --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 +42 @@
 # --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" \

issm/trunk-jpl/externalpackages/petsc/install-3.2-linux64.sh

@@ -18 +18 @@
 ./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 \

issm/trunk-jpl/externalpackages/petsc/install-3.2-macosx64.sh

@@ -20 +20 @@
   --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 \

issm/trunk-jpl/externalpackages/petsc/install-3.2-ubuntu64.sh

@@ -18 +18 @@
 ./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 \

issm/trunk-jpl/externalpackages/petsc/install-3.3-linux64.sh

@@ -18 +18 @@
 ./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" \

issm/trunk-jpl/externalpackages/petsc/install-3.3-macosx64.sh

@@ -18 +18 @@
 ./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" \

issm/trunk-jpl/externalpackages/petsc/install-3.3-walgreen.sh

@@ -18 +18 @@
  --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 \

issm/trunk-jpl/externalpackages/petsc/install-3.4-macosx64.sh

@@ -18 +18 @@
 ./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" \

issm/trunk-jpl/externalpackages/petsc/install-dev-linux64.sh

@@ -33 +33 @@
         ./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 \