Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.mac.patch =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.mac.patch (revision 19659) +++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.mac.patch (revision 19659) @@ -0,0 +1,8 @@ +91,93c91,93 +< #set( CMAKE_INSTALL_PREFIX +< # "/path/to/Dakota/installation" +< # CACHE PATH "Path to Dakota installation" ) +--- +> set( CMAKE_INSTALL_PREFIX +> "$ENV{ISSM_DIR}/externalpackages/dakota/install" +> CACHE PATH "Path to Dakota installation" ) Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.patch =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.patch (revision 19659) +++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.patch (revision 19659) @@ -0,0 +1,29 @@ +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.so" +> CACHE FILEPATH "Use installed MPI library" FORCE) +73,77c73,77 +< #set(BOOST_ROOT +< # "path/to/custom/Boost/install/directory" +< # CACHE PATH "Use non-standard Boost install" FORCE) +< #set( Boost_NO_SYSTEM_PATHS TRUE +< # CACHE BOOL "Supress search paths other than BOOST_ROOT" FORCE) +--- +> set(BOOST_ROOT +> "$ENV{ISSM_DIR}/externalpackages/boost/install" +> CACHE PATH "Use non-standard Boost install" FORCE) +> set( Boost_NO_SYSTEM_PATHS TRUE +> CACHE BOOL "Supress search paths other than BOOST_ROOT" FORCE) +91,93c91,93 +< #set( CMAKE_INSTALL_PREFIX +< # "/path/to/Dakota/installation" +< # CACHE PATH "Path to Dakota installation" ) +--- +> set( CMAKE_INSTALL_PREFIX +> "$ENV{ISSM_DIR}/externalpackages/dakota/install" +> CACHE PATH "Path to Dakota installation" ) Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.yosemite.patch =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.yosemite.patch (revision 19659) +++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.yosemite.patch (revision 19659) @@ -0,0 +1,29 @@ +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 +< # "path/to/custom/Boost/install/directory" +< # CACHE PATH "Use non-standard Boost install" FORCE) +< #set( Boost_NO_SYSTEM_PATHS TRUE +< # CACHE BOOL "Supress search paths other than BOOST_ROOT" FORCE) +--- +> set(BOOST_ROOT +> "$ENV{ISSM_DIR}/externalpackages/boost/install" +> CACHE PATH "Use non-standard Boost install" FORCE) +> set( Boost_NO_SYSTEM_PATHS TRUE +> CACHE BOOL "Supress search paths other than BOOST_ROOT" FORCE) +91,93c91,93 +< #set( CMAKE_INSTALL_PREFIX +< # "/path/to/Dakota/installation" +< # CACHE PATH "Path to Dakota installation" ) +--- +> set( CMAKE_INSTALL_PREFIX +> "$ENV{ISSM_DIR}/externalpackages/dakota/install" +> CACHE PATH "Path to Dakota installation" ) Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.patch =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.patch (revision 19659) +++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.patch (revision 19659) @@ -0,0 +1,4 @@ +47a48,50 +> set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libraries" FORCE) +> set(BUILD_SHARED_LIBS OFF CACHE BOOL "Set to ON to build DSO libraries" FORCE) +> Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.pfe.patch =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.pfe.patch (revision 19659) +++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.pfe.patch (revision 19659) @@ -0,0 +1,6 @@ +156c153,155 +< # TODO: Can't this be integrated into the following logic? +--- +> # TODO: Can't this be integrated into the following logic? +> set(BLAS_LIBS "-L/nasa/intel/mkl/10.0.011/lib/em64t/ -lmkl -lmkl_lapack -liomp5 -lpthread") +> set(LAPACK_LIBS "-L/nasa/intel/mkl/10.0.011/lib/em64t/ -lmkl -lmkl_lapack -liomp5 -lpthread") Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/DakotaDev.cmake.patch =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/DakotaDev.cmake.patch (revision 19659) +++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/DakotaDev.cmake.patch (revision 19659) @@ -0,0 +1,14 @@ +5,8c5,8 +< set(ENABLE_DAKOTA_DOCS TRUE CACHE BOOL "Enable DAKOTA documentation build") +< set(ENABLE_SPEC_MAINT TRUE CACHE BOOL +< "Enable DAKOTA specification maintenance mode?") +< set(PECOS_ENABLE_TESTS TRUE CACHE BOOL "Enable Pecos-specific tests?") +--- +> #set(ENABLE_DAKOTA_DOCS TRUE CACHE BOOL "Enable DAKOTA documentation build") +> #set(ENABLE_SPEC_MAINT TRUE CACHE BOOL +> # "Enable DAKOTA specification maintenance mode?") +> #set(PECOS_ENABLE_TESTS TRUE CACHE BOOL "Enable Pecos-specific tests?") +14c14 +< #set(HAVE_X_GRAPHICS OFF CACHE BOOL "Disable dependency on X libraries" FORCE) +--- +> set(HAVE_X_GRAPHICS OFF CACHE BOOL "Disable dependency on X libraries" FORCE) Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/NonDLocalReliability.cpp.patch =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/NonDLocalReliability.cpp.patch (revision 19659) +++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/NonDLocalReliability.cpp.patch (revision 19659) @@ -0,0 +1,9 @@ +2645a2646 +> // add sensitivity output to importance factors (jes, 8/06/10) +2651c2652,2655 +< << std::setw(width) << impFactor(j,i) << '\n'; +--- +> << std::setw(width) << impFactor(j,i) +> << " Sensitivity = " +> << std::resetiosflags(std::ios::adjustfield) +> << std::setw(width) << fnGradsMeanX(j,i) << '\n'; Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/NonDSampling.cpp.patch =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/NonDSampling.cpp.patch (revision 19659) +++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/NonDSampling.cpp.patch (revision 19659) @@ -0,0 +1,25 @@ +780,786c780,787 +< if (!subIteratorFlag) { +< nonDSampCorr.compute_correlations(vars_samples, resp_samples); +< // archive the correlations to the results DB +< nonDSampCorr.archive_correlations(run_identifier(), resultsDB, cv_labels, +< div_labels, dsv_labels, drv_labels, +< iteratedModel.response_labels()); +< } +--- +> //don't compute for now, too expensive. +> // if (!subIteratorFlag) { +> // nonDSampCorr.compute_correlations(vars_samples, resp_samples); +> // // archive the correlations to the results DB +> // nonDSampCorr.archive_correlations(run_identifier(), resultsDB, cv_labels, +> // div_labels, dsv_labels, drv_labels, +> // iteratedModel.response_labels()); +> // } +1277,1278c1278,1281 +< nonDSampCorr.print_correlations(s, cv_labels, div_labels, dsv_labels, +< drv_labels,iteratedModel.response_labels()); +--- +> +> //don't output for now. +> // nonDSampCorr.print_correlations(s, cv_labels, div_labels, dsv_labels, +> // drv_labels,iteratedModel.response_labels()); Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/pecos_global_defs.hpp.patch =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/pecos_global_defs.hpp.patch (revision 19659) +++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/pecos_global_defs.hpp.patch (revision 19659) @@ -0,0 +1,4 @@ +24a25 +> #ifndef PI +25a27 +> #endif Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64.sh (revision 19659) +++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64.sh (revision 19659) @@ -0,0 +1,55 @@ +#!/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.patch +patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.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 \ + -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 ..