Index: /issm/trunk-jpl/configs/config-linux64-pleiades-ampi-gcc.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-pleiades-ampi-gcc.sh	(revision 16578)
+++ /issm/trunk-jpl/configs/config-linux64-pleiades-ampi-gcc.sh	(revision 16579)
@@ -5,15 +5,18 @@
 	--with-wrappers=no \
 	--with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
-	--with-mpi-include="/nasa/mvapich2/1.6.sles11/gcc/include" \
-	--with-mpi-libflags="-L/nasa/mvapich2/1.6.sles11/gcc/lib -llmpe -lmpe -lmpich" \
+	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
 	--with-adolc-dir="$ISSM_DIR/externalpackages/adolc/install"\
 	--with-ampi-dir="$ISSM_DIR/externalpackages/adjoinablempi/install"\
+	--with-metis-dir="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-blas-lapack-dir="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-gsl-dir="$ISSM_DIR/externalpackages/gsl/install" \
-	--with-metis-dir="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-mumps-dir="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-scalapack-dir="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-hypre-dir="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-graphics-lib="/usr/lib64/libX11.so" \
-	--with-cxxoptflags="-g -O2" \
-	--with-vendor="intel-pleiades-gcc"
+	--with-cxxoptflags=" -O3 -march=corei7-avx" \
+	--with-vendor="intel-pleiades-gcc"  \
+	CFLAGS="-O3 -march=corei7-avx" \
+	CXXFLAGS="-O3 -march=corei7-avx" \
+	FFLAGS="-O3 -march=corei7-avx"