Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh (revision 24809) +++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh (revision 24810) @@ -17,4 +17,5 @@ export DAK_INSTALL=${DAK_ROOT}/install export DAK_SRC=${DAK_ROOT}/src +export GSL_HOME=${ISSM_DIR}/externalpackages/gsl/install export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lflapack -L/usr/lib/x86_64-linux-gnu -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it @@ -54,4 +55,6 @@ -DHAVE_ACRO=OFF \ -DHAVE_JEGA=OFF \ + -DHAVE_QUESO=ON \ + -DDAKOTA_HAVE_GSL=ON \ -C${DAK_SRC}/cmake/BuildDakotaCustom.cmake \ -C${DAK_SRC}/cmake/DakotaDev.cmake \ Index: /issm/trunk-jpl/externalpackages/gsl/install-1.15-linux.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gsl/install-1.15-linux.sh (revision 24810) +++ /issm/trunk-jpl/externalpackages/gsl/install-1.15-linux.sh (revision 24810) @@ -0,0 +1,36 @@ +#!/bin/bash +set -eu + + +# Constants +# +GSL_ROOT=${ISSM_DIR}/externalpackages/gsl +VER="1.15" + +# Cleanup= +rm -rf install src +mkdir install src + +# Download source +${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gsl-${VER}.tar.gz" "gsl-${VER}.tar.gz" + +# Unpack source +tar -zxvf gsl-${VER}.tar.gz + +# Move source to 'src' directory +mv gsl-${VER}/* src +rm -rf gsl-${VER} + +# Configure +cd src +./configure \ + --prefix="${GSL_ROOT}/install" + +# Compile and install +if [ $# -eq 0 ]; then + make + make install +else + make -j $1 + make -j $1 install +fi Index: /issm/trunk-jpl/jenkins/ross-debian_linux-codipack =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-codipack (revision 24809) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-codipack (revision 24810) @@ -22,9 +22,9 @@ --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \ --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \ --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \ --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \ --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \ - --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \ --with-medipack-dir="${ISSM_DIR}/externalpackages/medipack/install" \ --with-codipack-dir="${ISSM_DIR}/externalpackages/codipack/install" \ @@ -39,9 +39,9 @@ cmake install.sh petsc install-3.12-linux.sh + gsl install-1.15-linux.sh triangle install-linux.sh chaco install.sh m1qn3 install.sh semic install.sh - gsl install-linux64.sh medipack install.sh codipack install.sh Index: /issm/trunk-jpl/jenkins/ross-debian_linux-dakota =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-dakota (revision 24809) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-dakota (revision 24810) @@ -23,6 +23,7 @@ --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \ + --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \ --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \ - --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \ --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \ --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \ @@ -39,4 +40,5 @@ cmake install.sh petsc install-3.12-linux.sh + gsl install-1.15-linux.sh boost install-1.55-linux.sh dakota install-6.2-linux.sh Index: /issm/trunk-jpl/m4/issm_options.m4 =================================================================== --- /issm/trunk-jpl/m4/issm_options.m4 (revision 24809) +++ /issm/trunk-jpl/m4/issm_options.m4 (revision 24810) @@ -605,12 +605,6 @@ elif test "${DAKOTA_VERSION}" == "6.1" || test "${DAKOTA_VERSION}" == "6.2"; then if test "${BOOST_VERSION_MAJOR}" == "1"; then - if test "${BOOST_VERSION_MINOR}" == "55"; 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_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 -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 -L${BOOST_ROOT}/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system ${BLASLAPACKLIB}" - elif test "${BOOST_VERSION_MINOR}" = "72"; then - DAKOTAFLAGS="-DHAVE_CONFIG_H -DHAVE_CONFIG_H -DDISABLE_DAKOTA_CONFIG_H -DBOOST_DISABLE_ASSERTS -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 -DHAVE_ADAPTIVE_SAMPLING -DHAVE_ESM -DHAVE_CONMIN -DHAVE_DDACE -DHAVE_DREAM -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_NOMAD -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL" - dnl See $ISSM_DIR/dakota/build/src/Makefile.export.Dakota -> Dakota_LIBRARIES - DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system ${BLASLAPACKLIB}" - fi + DAKOTAFLAGS="-DHAVE_CONFIG_H -DHAVE_CONFIG_H -DDISABLE_DAKOTA_CONFIG_H -DBOOST_DISABLE_ASSERTS -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 -DHAVE_ADAPTIVE_SAMPLING -DHAVE_ESM -DHAVE_QUESO -DHAVE_QUESO_GPMSA -DHAVE_CONMIN -DHAVE_DDACE -DHAVE_DREAM -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_NOMAD -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL" + DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lqueso -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system ${BLASLAPACKLIB}" fi AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])