Index: sm/trunk-jpl/externalpackages/dakota/install-6.1-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.1-linux64.sh	(revision 19663)
+++ 	(revision )
@@ -1,51 +1,0 @@
-#!/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
-cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
-patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.1/BuildDakotaCustom.cmake.patch
-patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
-#patch $DAK_SRC/CMakeLists.txt configs/6.1/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 -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: sm/trunk-jpl/externalpackages/dakota/install-6.1-macosx64-yosemite.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.1-macosx64-yosemite.sh	(revision 19663)
+++ 	(revision )
@@ -1,51 +1,0 @@
-#!/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
-cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
-patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.1/BuildDakotaCustom.cmake.patch
-patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
-patch $DAK_SRC/CMakeLists.txt configs/6.1/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=/usr/local/gfortran/bin/gcc -D CMAKE_CXX_COMPILER=/usr/local/gfortran/bin/g++ -D CMAKE_Fortran_COMPILER=/usr/local/gfortran/bin/gfortran -D LDFLAGS="-std=gnu++0x" -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: sm/trunk-jpl/externalpackages/dakota/install-6.1-macosx64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.1-macosx64.sh	(revision 19663)
+++ 	(revision )
@@ -1,56 +1,0 @@
-#!/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
-cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
-patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.1/BuildDakotaCustom.cmake.mac.patch
-patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
-patch $DAK_SRC/CMakeLists.txt configs/6.1/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 -DBoost_NO_BOOST_CMAKE=TRUE \
-	   -DBoost_NO_SYSTEM_PATHS=TRUE \
-	   -DBOOST_ROOT:PATHNAME=$BOOST_ROOT \
-	   -DBoost_LIBRARY_DIRS:FILEPATH=${BOOST_ROOT}/lib \
-	   -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CC_COMPILER=gcc \
-	   -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: sm/trunk-jpl/externalpackages/dakota/install-6.1-mpi-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.1-mpi-linux64.sh	(revision 19663)
+++ 	(revision )
@@ -1,58 +1,0 @@
-#!/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: sm/trunk-jpl/externalpackages/dakota/install-6.1-mpi-macosx64-yosemite.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.1-mpi-macosx64-yosemite.sh	(revision 19663)
+++ 	(revision )
@@ -1,59 +1,0 @@
-#!/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.yosemite.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-mpi/ParallelLibrary.cpp.patch
-patch src/src/ParallelLibrary.hpp configs/6.1-mpi/ParallelLibrary.hpp.patch
-patch src/src/NonDSampling.cpp configs/6.1-mpi/NonDSampling.cpp.patch
-patch src/src/NonDLocalReliability.cpp configs/6.1-mpi/NonDLocalReliability.cpp.patch
-patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.1-mpi/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 \
-	   -D LDFLAGS="-std=gnu++0x" \
-		-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.2-macosx64-yosemite.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx64-yosemite.sh	(revision 19664)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx64-yosemite.sh	(revision 19664)
@@ -0,0 +1,57 @@
+#!/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.yosemite.patch
+patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
+patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.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=$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
+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.2-macosx64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx64.sh	(revision 19664)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx64.sh	(revision 19664)
@@ -0,0 +1,63 @@
+#!/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.mac.patch
+patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
+patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.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
+
+export BOOST_ROOT=$ISSM_DIR/externalpackages/boost/install
+
+#Configure dakota
+# Set your local gcc compiler here
+cd $DAK_BUILD
+cmake -DBoost_NO_BOOST_CMAKE=TRUE \
+	-DBoost_NO_SYSTEM_PATHS=TRUE \
+	-DBOOST_ROOT:PATHNAME=$BOOST_ROOT \
+	-DBoost_LIBRARY_DIRS:FILEPATH=${BOOST_ROOT}/lib \
+	-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
+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: sm/trunk-jpl/externalpackages/dakota/install-6.2-mpi-macosx64-yosemite.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-mpi-macosx64-yosemite.sh	(revision 19663)
+++ 	(revision )
@@ -1,57 +1,0 @@
-#!/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.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-mpi/BuildDakotaCustom.cmake.yosemite.patch
-patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2-mpi/DakotaDev.cmake.patch
-patch $DAK_SRC/CMakeLists.txt configs/6.2-mpi/CMakeLists.txt.patch
-
-#Apply patches
-patch src/src/NonDSampling.cpp configs/6.2-mpi/NonDSampling.cpp.patch
-patch src/src/NonDLocalReliability.cpp configs/6.2-mpi/NonDLocalReliability.cpp.patch
-patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2-mpi/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 \
-	   -D LDFLAGS="-std=gnu++0x" \
-		-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 ..