Index: /issm/trunk-jpl/externalpackages/boost/install-1.55-macosx-el_capitan.sh =================================================================== --- /issm/trunk-jpl/externalpackages/boost/install-1.55-macosx-el_capitan.sh (revision 20292) +++ /issm/trunk-jpl/externalpackages/boost/install-1.55-macosx-el_capitan.sh (revision 20293) @@ -36,7 +36,7 @@ #Compile boost # Need gcc with iconv installed in a location that has been added to your path -export CC=/usr/local/gfortan/bin/gcc -export CXX=/usr/local/gfortran/bin/g++ -./bjam toolset=darwin cxxflags=-std=gnu++11 link=static install +# export CC=/usr/local/gfortan/bin/gcc +# export CXX=/usr/local/gfortran/bin/g++ +./bjam toolset=darwin link=static install #put bjam into install also: Index: sm/trunk-jpl/externalpackages/dakota/install-6.2-macosx-el_capitan.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx-el_capitan.sh (revision 20292) +++ (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.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++11" \ - -D CXXFLAGS="-std=gnu++11" \ - -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 20292) +++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx64.sh (revision 20293) @@ -45,5 +45,7 @@ -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" \ + -D CMAKE_CXX_FLAGS=-fdelayed-template-parsing \ + -DHAVE_ACRO=off \ + -DHAVE_JEGA=off \ -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \ -C $DAK_SRC/cmake/DakotaDev.cmake \ Index: /issm/trunk-jpl/jenkins/macosx_pine-island_dakota =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island_dakota (revision 20292) +++ /issm/trunk-jpl/jenkins/macosx_pine-island_dakota (revision 20293) @@ -15,4 +15,6 @@ --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \ + --with-boost-dir=$ISSM_DIR/externalpackages/boost/install \ + --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \ --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \ --with-numthreads=4 \ @@ -21,5 +23,5 @@ #MATLAB path -MATLAB_PATH="/Applications/MATLAB_R2015b.app/" +MATLAB_PATH="/Applications/MATLAB_R2015a.app/" #PYTHON and MATLAB testing @@ -50,5 +52,5 @@ EXTERNALPACKAGES="autotools install.sh matlab install.sh - mpich install-3.0-macosx64-yosemite-dakota.sh + mpich install-3.0-macosx64.sh chaco install-macosx64.sh m1qn3 install.sh @@ -56,5 +58,5 @@ triangle install-macosx64.sh boost install-1.55-macosx-el_capitan.sh - dakota install-6.2-macosx-el_capitan.sh + dakota install-6.2-macosx64.sh shell2junit install.sh" Index: /issm/trunk-jpl/m4/issm_options.m4 =================================================================== --- /issm/trunk-jpl/m4/issm_options.m4 (revision 20292) +++ /issm/trunk-jpl/m4/issm_options.m4 (revision 20293) @@ -526,6 +526,6 @@ AC_DEFINE([DAKOTA_HAVE_MPI],[1],[enabling parallel MPI]) else if test x$DAKOTA_VERSION = x6.1 || test x$DAKOTA_VERSION = x6.2; then - DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_COLINY -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_JEGA -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL" - DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_ROOT/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -lscolib -ljega_fe -llhs -lpebbl -lcolin -linterfaces -llhs_mods -lmoga -loptpp -lsoga -lsurfpack -lutilib -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -l3po -lamplsolver -lcport -ldfftpack -leutils -lfsudace -lhopspack -ljega -lnidr -lpecos -lpsuade -ltinyxml -lutilities -lsparsegrid -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system" + DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL" + DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_ROOT/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system" AC_DEFINE([DISABLE_DAKOTA_CONFIG_H],[1],[disabling DAKOTA_CONFIG_H]) AC_DEFINE([DAKOTA_HAVE_MPI],[1],[enabling parallel MPI])