Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx64.sh	(revision 23422)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx64.sh	(revision 23423)
@@ -2,43 +2,44 @@
 set -eu
 
-#Some cleanup
-rm -rf Dakota
-rm -rf src
+# Constants
+DAK_VER="6.2"
+
+# Some cleanup
 rm -rf build
 rm -rf install
-mkdir src build install
+rm -rf tests
+rm -rf src
+mkdir build install src
 
-#Download from ISSM server
-$ISSM_DIR/scripts/download_external_package.bash 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz'
+# Download from ISSM server
+$ISSM_DIR/scripts/download_external_package.bash 'https://issm.ess.uci.edu/files/externalpackages/dakota-${DAK_VER}-public.src.tar.gz' 'dakota-${DAK_VER}-public-src.tar.gz'
 
-#Untar
-tar -zxvf dakota-6.2-public-src.tar.gz
+# Untar
+tar -zxvf dakota-${DAK_VER}-public-src.tar.gz
 
-#Move Dakota to src directory
-mv dakota-6.2.0.src/* src
-rm -rf dakota-6.2.0.src
+# Move Dakota to src directory
+mv dakota-${DAK_VER}.0.src/* src
+rm -rf dakota-${DAK_VER}.0.src
 
-#Set up Dakota cmake variables and config
+# Set up Dakota cmake variables and config
 DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
 DAK_INSTALL=$ISSM_DIR/externalpackages/dakota/install
 DAK_SRC=$ISSM_DIR/externalpackages/dakota/src
 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
+# Apply patches
+cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/$DAK_VER/BuildDakotaCustom.cmake.mac.patch
+patch $DAK_SRC/cmake/DakotaDev.cmake configs/$DAK_VER/DakotaDev.cmake.patch
+patch $DAK_SRC/CMakeLists.txt configs/$DAK_VER/CMakeLists.txt.patch
+patch src/src/NonDSampling.cpp configs/$DAK_VER/NonDSampling.cpp.patch
+patch src/src/NonDLocalReliability.cpp configs/$DAK_VER/NonDLocalReliability.cpp.patch
+patch src/packages/pecos/src/pecos_global_defs.hpp configs/$DAK_VER/pecos_global_defs.hpp.patch
+
+# Configure dakota
 # Set your local gcc compiler here
 cd $DAK_BUILD
-cmake -DCMAKE_INSTALL_PREFIX=$DAK_INSTALL \
-	-DCMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
+cmake -DCMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
 	-DCMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
 	-DCMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
@@ -67,3 +68,2 @@
 	make -j $1 install
 fi
-