Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.discover16.patch
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.discover16.patch	(revision 22002)
+++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.discover16.patch	(revision 22002)
@@ -0,0 +1,6 @@
+156c153,155
+< # TODO: Can't this be integrated into the following logic?
+---
+> # TODO: Can't this be integrated into the following logic?
+> set(BLAS_LIBS "-L/usr/local/intel/2016/compilers_and_libraries_2016.2.181/linux/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm")
+> set(LAPACK_LIBS "-L/usr/local/intel/2016/compilers_and_libraries_2016.2.181/linux/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm")
Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-intel16-discover.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-intel16-discover.sh	(revision 22002)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-intel16-discover.sh	(revision 22002)
@@ -0,0 +1,58 @@
+#!/bin/bash
+set -eu
+
+#Some cleanup
+rm -rf Dakota
+rm -rf src 
+rm -rf build 
+rm -rf install 
+mkdir src build install 
+
+#Download from ISSM server
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz'
+
+#Untar 
+tar -zxvf dakota-6.2-public-src.tar.gz
+
+#Move Dakota to src directory
+mv dakota-6.2.0.src/* src
+rm -rf dakota-6.2.0.src
+
+#Set up Dakota cmake variables and config
+export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src
+export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
+export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
+cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.discover.patch
+patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
+patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.discover16.patch
+
+#Apply patches
+patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch
+patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch
+patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch
+
+#Configure dakota
+cd $DAK_BUILD
+
+cmake -D CMAKE_C_COMPILER=mpicc \
+	   -D CMAKE_CXX_COMPILER=mpicxx \
+	   -D CMAKE_Fortran_COMPILER=/usr/bin/gfortran \
+		-DHAVE_ACRO=off \
+		-DHAVE_JEGA=off \
+		-C $DAK_SRC/cmake/BuildDakotaCustom.cmake \
+		-C $DAK_SRC/cmake/DakotaDev.cmake \
+		$DAK_SRC
+cd ..
+
+#Compile and install dakota
+cd $DAK_BUILD
+if [ $# -eq 0 ];
+then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
+cd ..
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.6-discover.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.6-discover.sh	(revision 22001)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.6-discover.sh	(revision 22002)
@@ -21,7 +21,7 @@
 	--prefix="$ISSM_DIR/externalpackages/petsc/install" \
 	--PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
-	--with-blas-lapack-dir="/usr/local/intel/Composer/composer_xe_2015.0.090/mkl/" \
-	--with-mpi-lib="/usr/local/intel/mpi/4.0.3.008/lib64/libmpi.so" \
-	--with-mpi-include="/usr/local/intel/mpi/4.0.3.008/intel64/include/" \
+	--with-blas-lapack-dir="/usr/local/intel/2016/compilers_and_libraries_2016.2.181/linux/mkl/" \
+	--with-mpi-lib="/usr/local/intel/2016/impi/5.1.3.181/lib64/libmpi.so" \
+	--with-mpi-include="/usr/local/intel/2016/impi/5.1.3.181/include64/" \
 	--known-mpi-shared-libraries=1 \
 	--with-debugging=0 \
@@ -49,6 +49,6 @@
 
 . /usr/share/modules/init/bash
-module load comp/intel-15.0.0.090
-module load mpi/impi-4.0.3.008
+module load comp/intel-16.0.2.181
+module load mpi/impi-5.1.3.181
 module load other/cmake-3.8.2