Index: /issm/trunk-jpl/externalpackages/dakota/configs/5.3.1/BuildDakotaCustom.cmake.patch
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/configs/5.3.1/BuildDakotaCustom.cmake.patch	(revision 15246)
+++ /issm/trunk-jpl/externalpackages/dakota/configs/5.3.1/BuildDakotaCustom.cmake.patch	(revision 15247)
@@ -1,16 +1,2 @@
-41,46c41,46
-< #set( BLAS_LIBS 
-< #      "/usr/lib64"
-< #      CACHE FILEPATH "Use non-standard BLAS library path" FORCE )
-< #set( LAPACK_LIBS 
-< #      "/usr/lib64"
-< #      CACHE FILEPATH "Use non-standard BLAS library path" FORCE )
----
-> set( BLAS_LIBS 
->       "/usr/lib64/libblas.so.3.0.3"
->       CACHE FILEPATH "Use non-standard BLAS library path" FORCE )
-> set( LAPACK_LIBS 
->       "/usr/lib64/liblapack.so.3.0.3"
->       CACHE FILEPATH "Use non-standard BLAS library path" FORCE )
 64,65c64,65
 < #set( DAKOTA_HAVE MPI ON
Index: sm/trunk-jpl/externalpackages/dakota/install-5.3.1-linux64-astrid.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-5.3.1-linux64-astrid.sh	(revision 15246)
+++ 	(revision )
@@ -1,50 +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-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz'
-
-#Untar 
-tar -zxvf dakota-5.3.1-public-src.tar.gz
-
-#Move Dakota to src directory
-mv dakota-5.3.1.src/* src
-rm -rf dakota-5.3.1.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/5.3.1/BuildDakotaCustom.cmake.patch
-patch $DAK_SRC/cmake/DakotaDev.cmake configs/5.3.1/DakotaDev.cmake.patch
-
-#Apply patches
-patch src/src/ParallelLibrary.cpp configs/5.3.1/ParallelLibrary.cpp.patch
-patch src/src/ParallelLibrary.hpp configs/5.3.1/ParallelLibrary.hpp.patch
-patch src/src/NonDSampling.cpp configs/5.3.1/NonDSampling.cpp.patch
-patch src/src/NonDLocalReliability.cpp configs/5.3.1/NonDLocalReliability.cpp.patch
-patch src/packages/pecos/src/pecos_global_defs.hpp configs/5.3.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: /issm/trunk-jpl/externalpackages/dakota/install-5.3.1-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-5.3.1-linux64.sh	(revision 15247)
+++ /issm/trunk-jpl/externalpackages/dakota/install-5.3.1-linux64.sh	(revision 15247)
@@ -0,0 +1,50 @@
+#!/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-5.3.1-public-src.tar.gz' 'dakota-5.3.1-public-src.tar.gz'
+
+#Untar 
+tar -zxvf dakota-5.3.1-public-src.tar.gz
+
+#Move Dakota to src directory
+mv dakota-5.3.1.src/* src
+rm -rf dakota-5.3.1.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/5.3.1/BuildDakotaCustom.cmake.patch
+patch $DAK_SRC/cmake/DakotaDev.cmake configs/5.3.1/DakotaDev.cmake.patch
+
+#Apply patches
+patch src/src/ParallelLibrary.cpp configs/5.3.1/ParallelLibrary.cpp.patch
+patch src/src/ParallelLibrary.hpp configs/5.3.1/ParallelLibrary.hpp.patch
+patch src/src/NonDSampling.cpp configs/5.3.1/NonDSampling.cpp.patch
+patch src/src/NonDLocalReliability.cpp configs/5.3.1/NonDLocalReliability.cpp.patch
+patch src/packages/pecos/src/pecos_global_defs.hpp configs/5.3.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 ..