Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.1-mpi/BuildDakotaCustom.cmake.mac.patch
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/configs/6.1-mpi/BuildDakotaCustom.cmake.mac.patch	(revision 19549)
+++ /issm/trunk-jpl/externalpackages/dakota/configs/6.1-mpi/BuildDakotaCustom.cmake.mac.patch	(revision 19550)
@@ -1,8 +1,2 @@
-64,65c64,65
-< #set( DAKOTA_HAVE_MPI ON
-< #     CACHE BOOL "Build with MPI enabled" FORCE)
----
-> set( DAKOTA_HAVE_MPI OFF
->      CACHE BOOL "Build with MPI disabled" FORCE)
 91,93c91,93
 < #set( CMAKE_INSTALL_PREFIX
Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.1-mpi/BuildDakotaCustom.cmake.patch
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/configs/6.1-mpi/BuildDakotaCustom.cmake.patch	(revision 19549)
+++ /issm/trunk-jpl/externalpackages/dakota/configs/6.1-mpi/BuildDakotaCustom.cmake.patch	(revision 19550)
@@ -1,2 +1,11 @@
+67a68,75
+> set( DAKOTA_HAVE_MPI ON
+>  CACHE BOOL "Always build with MPI enabled" FORCE)
+> set( MPI_INCLUDE_PATH
+>  "$ENV{ISSM_DIR}/externalpackages/mpich/install/include"
+>  CACHE FILEPATH "Use installed MPI headers" FORCE)
+> set( MPI_LIBRARY
+>  "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.a"
+>  CACHE FILEPATH "Use installed MPI library" FORCE)
 73,77c73,77
 < #set(BOOST_ROOT
Index: /issm/trunk-jpl/externalpackages/dakota/install-6.1-mpi-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.1-mpi-linux64.sh	(revision 19550)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.1-mpi-linux64.sh	(revision 19550)
@@ -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.1-public.src.tar.gz' 'dakota-6.1-public-src.tar.gz'
+
+#Untar 
+tar -zxvf dakota-6.1-public-src.tar.gz
+
+#Move Dakota to src directory
+mv dakota-6.1.0.src/* src
+rm -rf dakota-6.1.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.1-mpi/BuildDakotaCustom.cmake.patch
+patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1-mpi/DakotaDev.cmake.patch
+#patch $DAK_SRC/CMakeLists.txt configs/6.1-mpi/CMakeLists.txt.patch
+
+#Apply patches
+patch src/src/ParallelLibrary.cpp configs/6.1/ParallelLibrary.cpp.patch
+patch src/src/ParallelLibrary.hpp configs/6.1/ParallelLibrary.hpp.patch
+patch src/src/NonDSampling.cpp configs/6.1/NonDSampling.cpp.patch
+patch src/src/NonDLocalReliability.cpp configs/6.1/NonDLocalReliability.cpp.patch
+#patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.1/pecos_global_defs.hpp.patch
+
+#Configure dakota
+cd $DAK_BUILD
+
+cmake -D CMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
+	   -D CMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
+	   -D CMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
+		-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/dakota/install-6.1-mpi-macosx64-yosemite.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.1-mpi-macosx64-yosemite.sh	(revision 19549)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.1-mpi-macosx64-yosemite.sh	(revision 19550)
@@ -22,4 +22,5 @@
 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.1-mpi/BuildDakotaCustom.cmake.patch
@@ -28,8 +29,8 @@
 
 #Apply patches
-#patch src/src/ParallelLibrary.cpp configs/6.1/ParallelLibrary.cpp.patch
-#patch src/src/ParallelLibrary.hpp configs/6.1/ParallelLibrary.hpp.patch
-#patch src/src/NonDSampling.cpp configs/6.1/NonDSampling.cpp.patch
-#patch src/src/NonDLocalReliability.cpp configs/6.1/NonDLocalReliability.cpp.patch
+patch src/src/ParallelLibrary.cpp configs/6.1/ParallelLibrary.cpp.patch
+patch src/src/ParallelLibrary.hpp configs/6.1/ParallelLibrary.hpp.patch
+patch src/src/NonDSampling.cpp configs/6.1/NonDSampling.cpp.patch
+patch src/src/NonDLocalReliability.cpp configs/6.1/NonDLocalReliability.cpp.patch
 #patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.1/pecos_global_defs.hpp.patch
 
@@ -38,10 +39,10 @@
 
 cmake -D CMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
-	-D CMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
-	-D CMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
-	-D LDFLAGS="-std=gnu++0x" \
-	-C $DAK_SRC/cmake/BuildDakotaCustom.cmake \
-	-C $DAK_SRC/cmake/DakotaDev.cmake \
-	$DAK_SRC
+	   -D CMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
+	   -D CMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
+	   -D LDFLAGS="-std=gnu++0x" \
+		-C $DAK_SRC/cmake/BuildDakotaCustom.cmake \
+		-C $DAK_SRC/cmake/DakotaDev.cmake \
+		$DAK_SRC
 cd ..