Index: ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64-yosemite.sh
===================================================================
--- ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64-yosemite.sh	(revision 0)
+++ ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64-yosemite.sh	(revision 19540)
@@ -0,0 +1,51 @@
+#!/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 ..

Property changes on: ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64-yosemite.sh
___________________________________________________________________
Added: svn:executable
   + *

Index: ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64.sh
===================================================================
--- ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64.sh	(revision 0)
+++ ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64.sh	(revision 19540)
@@ -0,0 +1,56 @@
+#!/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 ..

Property changes on: ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64.sh
___________________________________________________________________
Added: svn:executable
   + *

Index: ../trunk-jpl/externalpackages/dakota/install-6.1-linux64.sh
===================================================================
--- ../trunk-jpl/externalpackages/dakota/install-6.1-linux64.sh	(revision 19539)
+++ ../trunk-jpl/externalpackages/dakota/install-6.1-linux64.sh	(revision 19540)
@@ -23,7 +23,7 @@
 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/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
 #patch $DAK_SRC/CMakeLists.txt configs/6.1/CMakeLists.txt.patch
 
 #Apply patches