Index: ../trunk-jpl/externalpackages/petsc/install-3.5-pleiades-intel2012.0.032-mpt.2.06rp16.sh
===================================================================
--- ../trunk-jpl/externalpackages/petsc/install-3.5-pleiades-intel2012.0.032-mpt.2.06rp16.sh	(revision 18976)
+++ ../trunk-jpl/externalpackages/petsc/install-3.5-pleiades-intel2012.0.032-mpt.2.06rp16.sh	(revision 18977)
@@ -1,64 +0,0 @@
-#!/bin/bash
-set -eu
-
-#Some cleanup
-rm -rf install petsc-3.5.2 src
-mkdir install src
-
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.5.2.tar.gz' 'petsc-3.5.2.tar.gz'
-
-#Untar and move petsc to install directory
-tar -zxvf  petsc-3.5.2.tar.gz
-mv petsc-3.5.2/* src/
-rm -rf petsc-3.5.2
-
-#configure
-cd src
-./config/configure.py \
-  --prefix="$ISSM_DIR/externalpackages/petsc/install" \
-  --PETSC_ARCH="$ISSM_ARCH" \
-  --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
-  --with-batch=1  \
-  --with-debugging=0 \
-  --with-x=0 \
-  --with-ssl=0 \
-  --with-shared-libraries=1 \
-  --known-mpi-shared-libraries=1 \
-  --with-mpi=1 \
-  --with-mpi-lib="/nasa/sgi/mpt/2.06rp16/lib/libmpi.so" \
-  --with-mpi-include="/nasa/sgi/mpt/2.06rp16/include" \
-  --with-blas-lapack-dir="/nasa/intel/Compiler/2012.0.032/composer_xe_2011_sp1/mkl/lib/intel64" \
-  --download-scalapack=yes \
-  --download-mumps=yes \
-  --download-metis=yes \
-  --download-parmetis=yes \
-  --download-trilinos=yes \
-  --download-euclid=yes \
-  --download-hypre=yes \
-  --COPTFLAGS="-lmpi -O3" \
-  --FOPTFLAGS="-lmpi -O3" \
-  --CXXOPTFLAGS="-lmpi -O3"
-
-#prepare script to reconfigure petsc
-cat > script.queue << EOF
-#PBS -S /bin/bash
-#PBS -l select=1:ncpus=1:model=wes 
-#PBS -l walltime=200 
-#PBS -W group_list=s1010
-#PBS -m e 
-
-. /usr/share/modules/init/bash 
-module load comp-intel/2012.0.032
-module load math/intel_mkl_64_10.0.011
-module load mpi-sgi/mpt.2.06rp16
-
-export PATH="$PATH:." 
-export MPI_GROUP_MAX=64 
-mpiexec -np 1 ./conftest-linux-gnu-ia64-intel.py
-EOF
-
-#print instructions
-echo "== Now: cd src/ "
-echo "== qsub -q devel script.queue "
-echo "== Then run reconfigure script generated by PETSc and follow instructions"
Index: ../trunk-jpl/externalpackages/petsc/install-3.5-pleiades-intel2015.0.090-mpt.2.11r13.sh
===================================================================
--- ../trunk-jpl/externalpackages/petsc/install-3.5-pleiades-intel2015.0.090-mpt.2.11r13.sh	(revision 18976)
+++ ../trunk-jpl/externalpackages/petsc/install-3.5-pleiades-intel2015.0.090-mpt.2.11r13.sh	(revision 18977)
@@ -1,60 +0,0 @@
-#!/bin/bash
-set -eu
-
-#Some cleanup
-rm -rf install petsc-3.5.2 src
-mkdir install src
-
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.5.2.tar.gz' 'petsc-3.5.2.tar.gz'
-
-#Untar and move petsc to install directory
-tar -zxvf  petsc-3.5.2.tar.gz
-mv petsc-3.5.2/* src/
-rm -rf petsc-3.5.2
-
-#configure
-cd src
-./config/configure.py \
-	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
-	--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
-	--with-blas-lapack-dir="/nasa/intel/Compiler/2015.0.090/composer_xe_2015.0.090/mkl/" \
-	--with-mpi-lib="/nasa/sgi/mpt/2.11r13/lib/libmpi.so" \
-	--with-mpi-include="/nasa/sgi/mpt/2.11r13/include" \
-	--known-mpi-shared-libraries=1 \
-	--with-debugging=0 \
-	--with-valgrind=0 \
-	--with-x=0 \
-	--with-ssl=0 \
-	--with-batch=1  \
-	--with-shared-libraries=1 \
-	--download-metis=1 \
-	--download-parmetis=1 \
-	--download-mumps=1 \
-	--download-scalapack=1 \
-	--download-fblaslapack=1 \
-	--COPTFLAGS="-lmpi -O3" \
-	--FOPTFLAGS="-lmpi -O3" \
-	--CXXOPTFLAGS="-lmpi -O3"
-
-#prepare script to reconfigure petsc
-cat > script.queue << EOF
-#PBS -S /bin/bash
-#PBS -l select=1:ncpus=1:model=wes 
-#PBS -l walltime=200 
-#PBS -W group_list=s1010
-#PBS -m e 
-
-. /usr/share/modules/init/bash 
-module load comp-intel/2015.0.090
-module load mpi-sgi/mpt.2.11r13
-
-export PATH="$PATH:." 
-export MPI_GROUP_MAX=64 
-mpiexec -np 1 ./conftest-arch-linux2-c-opt
-EOF
-
-#print instructions
-echo "== Now: cd src/ "
-echo "== qsub -q devel script.queue "
-echo "== Then run reconfigure script generated by PETSc and follow instructions"
Index: ../trunk-jpl/externalpackages/petsc/install-3.5-pleiades.sh
===================================================================
--- ../trunk-jpl/externalpackages/petsc/install-3.5-pleiades.sh	(revision 18976)
+++ ../trunk-jpl/externalpackages/petsc/install-3.5-pleiades.sh	(revision 18977)
@@ -18,9 +18,9 @@
 ./config/configure.py \
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
 	--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
-	--with-blas-lapack-dir="/nasa/intel/mkl/10.0.011/" \
-	--with-mpi-lib="/nasa/sgi/mpt/2.06rp16/lib/libmpi.so" \
-	--with-mpi-include="/nasa/sgi/mpt/2.06rp16/include" \
+	--with-blas-lapack-dir="/nasa/intel/Compiler/2015.0.090/composer_xe_2015.0.090/mkl/" \
+	--with-mpi-lib="/nasa/sgi/mpt/2.11r13/lib/libmpi.so" \
+	--with-mpi-include="/nasa/sgi/mpt/2.11r13/include" \
 	--known-mpi-shared-libraries=1 \
 	--with-debugging=0 \
 	--with-valgrind=0 \
@@ -32,10 +32,7 @@
 	--download-parmetis=1 \
 	--download-mumps=1 \
 	--download-scalapack=1 \
-	--download-fblaslapack=1 \
-	--COPTFLAGS="-lmpi -O3" \
-	--FOPTFLAGS="-lmpi -O3" \
-	--CXXOPTFLAGS="-lmpi -O3"
+	--download-fblaslapack=1
 
 #prepare script to reconfigure petsc
 cat > script.queue << EOF
@@ -46,9 +43,8 @@
 #PBS -m e 
 
 . /usr/share/modules/init/bash 
-module load comp-intel/11.1.046
-module load math/intel_mkl_64_10.0.011
-module load mpi-sgi/mpt.2.06rp16
+module load comp-intel/2015.0.090
+module load mpi-sgi/mpt.2.11r13
 
 export PATH="$PATH:." 
 export MPI_GROUP_MAX=64 
