Index: /issm/trunk/externalpackages/README
===================================================================
--- /issm/trunk/externalpackages/README	(revision 8165)
+++ /issm/trunk/externalpackages/README	(revision 8166)
@@ -1,10 +1,7 @@
 To install all the ISSM libraries:
 
-1/ source the ISSM_TIER/Etc/environment.sh file. This will set up all the necessary 
-environment variables in your shell.
+1/ go into each library folder and type install.sh . 
 
-2/ go into each library folder and type install.sh . 
-
-3/ There is no guarantee the compilation will work on all systems. A lot of tweaking of the 
+2/ There is no guarantee the compilation will work on all systems. A lot of tweaking of the 
 install.sh files will probably be involved. Especially, the configuration part of the install.
 
@@ -13,2 +10,12 @@
 libraries, go in the configs/ directory, pick up the correct configuration file and copy it to the top 
 folder of the library compilation. Tweak if necessary.
+
+machine characteristics:
+
+-astrid: linux 64 bits
+-castor: altix 64 bits
+-cosmos: JPL cluster 32 bits
+-macmathieu: iMac 24" 2009 32 bits
+-maceric: MacBook Pro 15" 2010 32 bits
+-ogive: Mac Pro 2008 32 bits
+-pleiades: AMES cluster
Index: /issm/trunk/externalpackages/dakota/configs/castor/configure.sh
===================================================================
--- /issm/trunk/externalpackages/dakota/configs/castor/configure.sh	(revision 8166)
+++ /issm/trunk/externalpackages/dakota/configs/castor/configure.sh	(revision 8166)
@@ -0,0 +1,1 @@
+./configure --prefix="$ISSM_TIER/externalpackages/dakota/install" --without-graphics  --with-pic --with-blas=/opt/intel/mkl/9.1.023/lib/64/libmkl.so --with-lapack=/opt/intel/mkl/9.1.023/lib/64/libmkl_lapack.so --disable-mpi
Index: /issm/trunk/externalpackages/metis/configs/castor/Makefile.in.patch
===================================================================
--- /issm/trunk/externalpackages/metis/configs/castor/Makefile.in.patch	(revision 8166)
+++ /issm/trunk/externalpackages/metis/configs/castor/Makefile.in.patch	(revision 8166)
@@ -0,0 +1,10 @@
+3,5c3
+< CC = gcc
+< OBJ_EXT=o
+< LIB_EXT=a
+---
+> CC = cc
+8c6
+< OPTFLAGS = -DLINUX -fPIC
+---
+> OPTFLAGS = -O2 
Index: /issm/trunk/externalpackages/mpich2/configs/castor/Examples.Makefile.patch
===================================================================
--- /issm/trunk/externalpackages/mpich2/configs/castor/Examples.Makefile.patch	(revision 8166)
+++ /issm/trunk/externalpackages/mpich2/configs/castor/Examples.Makefile.patch	(revision 8166)
@@ -0,0 +1,6 @@
+72,73c72,73
+< cpi: cpi.o   ../lib/lib${MPILIBNAME}.a
+< 	$(C_LINK) $(LDFLAGS) -o cpi cpi.o  -lm ${LIBS}
+---
+> cpi: cpi.o   ../lib/lib${MPILIBNAME}.a 
+> 	$(C_LINK) $(LDFLAGS) -o cpi cpi.o  -lm ${LIBS} ../lib/libmpich.a
Index: /issm/trunk/externalpackages/mpich2/configs/castor/configure.sh
===================================================================
--- /issm/trunk/externalpackages/mpich2/configs/castor/configure.sh	(revision 8166)
+++ /issm/trunk/externalpackages/mpich2/configs/castor/configure.sh	(revision 8166)
@@ -0,0 +1,2 @@
+#!/bin/bash
+./configure --prefix="$ISSM_TIER/externalpackages/mpich2/install" --enable-sharedlibs=gcc --enable-f91=gfortran 
Index: /issm/trunk/externalpackages/mpich2/configs/castor/mpicxx.h.patch
===================================================================
--- /issm/trunk/externalpackages/mpich2/configs/castor/mpicxx.h.patch	(revision 8166)
+++ /issm/trunk/externalpackages/mpich2/configs/castor/mpicxx.h.patch	(revision 8166)
@@ -0,0 +1,12 @@
+26c26
+< //#error "SEEK_SET is #defined but must not be for the C++ binding of MPI"
+---
+> #error "SEEK_SET is #defined but must not be for the C++ binding of MPI"
+30c30
+< //#error "SEEK_CUR is #defined but must not be for the C++ binding of MPI"
+---
+> #error "SEEK_CUR is #defined but must not be for the C++ binding of MPI"
+35c35
+< //#error "SEEK_END is #defined but must not be for the C++ binding of MPI"
+---
+> #error "SEEK_END is #defined but must not be for the C++ binding of MPI"
Index: /issm/trunk/externalpackages/petsc/configs/2.3.2-p3/castor/configure.sh
===================================================================
--- /issm/trunk/externalpackages/petsc/configs/2.3.2-p3/castor/configure.sh	(revision 8166)
+++ /issm/trunk/externalpackages/petsc/configs/2.3.2-p3/castor/configure.sh	(revision 8166)
@@ -0,0 +1,9 @@
+#After Plapack is fixed
+
+#set PETSC_DIR variable, in case.
+PETSC_DIR=$ISSM_TIER/externalpackages/petsc/install
+
+./config/configure.py  --prefix=$PETSC_DIR --with-batch=1  --ISSM_ARCH=$ISSM_ARCH --PETSC_DIR=$PETSC_DIR   --with-debugging=no --with-shared=0 COPTFLAGS=-O3 FOPTFLAGS=-O3 --with-blas-lapack-dir=/opt/intel/mkl/9.1.023 --with-mpi-lib=/usr/lib/libmpi.so --with-mpi-include=/usr/include  --with-mpi-shared=0 --download-mumps=yes --download-scalapack=yes --download-blacs=yes  --with-plapack-dir=$PETSC_DIR/externalpackages/PLAPACKR32-hg/$ISSM_ARCH --FFLAGS=-I/usr/include --with-cc=icc --with-fc=ifort
+
+#Before Plapack implodes
+#./config/configure.py  --prefix=$PETSC_DIR --with-batch=1  --ISSM_ARCH=$ISSM_ARCH --PETSC_DIR=$PETSC_DIR   --with-debugging=no --with-shared=0 COPTFLAGS=-O3 FOPTFLAGS=-O3 --with-blas-lapack-dir=/opt/intel/mkl/9.1.023 --with-mpi-lib=/usr/lib/libmpi.so --with-mpi-include=/usr/include  --with-mpi-shared=0 --download-mumps=yes --download-scalapack=yes --download-blacs=yes  --download-plapack=yes --FFLAGS=-I/usr/include --with-cc=icc --with-fc=ifort
Index: /issm/trunk/externalpackages/petsc/configs/3.1-p7/castor/configure.sh
===================================================================
--- /issm/trunk/externalpackages/petsc/configs/3.1-p7/castor/configure.sh	(revision 8166)
+++ /issm/trunk/externalpackages/petsc/configs/3.1-p7/castor/configure.sh	(revision 8166)
@@ -0,0 +1,13 @@
+#After Plapack is fixed
+
+#set PETSC_DIR variable, in case.
+PETSC_DIR=$ISSM_TIER/externalpackages/petsc/install
+
+./config/configure.py \
+  --prefix="$ISSM_TIER/externalpackages/petsc/install" --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+  --with-batch=1  --ISSM_ARCH=$ISSM_ARCH --with-debugging=no --with-shared=0 COPTFLAGS=-O3 FOPTFLAGS=-O3 --with-blas-lapack-dir=/opt/intel/mkl/9.1.023 --with-mpi-lib=/usr/lib/libmpi.so --with-mpi-include=/usr/include  --with-mpi-shared=0 --download-mumps=yes --download-scalapack=yes --download-blacs=yes  --with-plapack-dir=$PETSC_DIR/externalpackages/PLAPACKR32-hg/$ISSM_ARCH --FFLAGS=-I/usr/include --with-cc=icc --with-fc=ifort  --download-parmetis=yes
+
+#Before Plapack implodes
+#./config/configure.py \
+#  --prefix="$ISSM_TIER/externalpackages/petsc/install" --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \
+#  --ISSM_ARCH=$ISSM_ARCH --with-debugging=no --with-shared=0 COPTFLAGS=-O3 FOPTFLAGS=-O3 --with-blas-lapack-dir=/opt/intel/mkl/9.1.023 --with-mpi-lib=/usr/lib/libmpi.so --with-mpi-include=/usr/include  --with-mpi-shared=0 --download-mumps=yes --download-scalapack=yes --download-blacs=yes  --download-plapack=yes --FFLAGS=-I/usr/include --with-cc=icc --with-fc=ifort  --download-parmetis=yes
Index: /issm/trunk/externalpackages/triangle/configs/castor/configure.make
===================================================================
--- /issm/trunk/externalpackages/triangle/configs/castor/configure.make	(revision 8166)
+++ /issm/trunk/externalpackages/triangle/configs/castor/configure.make	(revision 8166)
@@ -0,0 +1,4 @@
+CC=gcc
+CSWITCHES = $(CFLAGS) -I$(MATLAB_DIR)/extern/include  -I$(MATLAB_DIR)/include -DLIN64 -fPIC
+OBJ_EXT=o
+LIB_EXT=a
Index: /issm/trunk/externalpackages/valgrind/configs/castor/configure.sh
===================================================================
--- /issm/trunk/externalpackages/valgrind/configs/castor/configure.sh	(revision 8166)
+++ /issm/trunk/externalpackages/valgrind/configs/castor/configure.sh	(revision 8166)
@@ -0,0 +1,2 @@
+#!/bin/bash
+./configure   --prefix="$ISSM_TIER/externalpackages/valgrind/install"