source: issm/oecreview/Archive/24684-25833/ISSM-24809-24810.diff

Last change on this file was 25834, checked in by Mathieu Morlighem, 4 years ago

CHG: added 24684-25833
File size: 7.9 KB
RevLine 
[25834]1Index: ../trunk-jpl/m4/issm_options.m4
2===================================================================
3--- ../trunk-jpl/m4/issm_options.m4 (revision 24809)
4+++ ../trunk-jpl/m4/issm_options.m4 (revision 24810)
5@@ -604,14 +604,8 @@
6 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI])
7 elif test "${DAKOTA_VERSION}" == "6.1" || test "${DAKOTA_VERSION}" == "6.2"; then
8 if test "${BOOST_VERSION_MAJOR}" == "1"; then
9- if test "${BOOST_VERSION_MINOR}" == "55"; then
10- 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"
11- 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}"
12- elif test "${BOOST_VERSION_MINOR}" = "72"; then
13- 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"
14- dnl See $ISSM_DIR/dakota/build/src/Makefile.export.Dakota -> Dakota_LIBRARIES
15- 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}"
16- fi
17+ 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"
18+ 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}"
19 fi
20 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])
21 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI])
22Index: ../trunk-jpl/externalpackages/dakota/install-6.2-linux.sh
23===================================================================
24--- ../trunk-jpl/externalpackages/dakota/install-6.2-linux.sh (revision 24809)
25+++ ../trunk-jpl/externalpackages/dakota/install-6.2-linux.sh (revision 24810)
26@@ -16,6 +16,7 @@
27 export DAK_BUILD=${DAK_ROOT}/build
28 export DAK_INSTALL=${DAK_ROOT}/install
29 export DAK_SRC=${DAK_ROOT}/src
30+export GSL_HOME=${ISSM_DIR}/externalpackages/gsl/install
31 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
32
33 # Cleanup
34@@ -53,6 +54,8 @@
35 -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \
36 -DHAVE_ACRO=OFF \
37 -DHAVE_JEGA=OFF \
38+ -DHAVE_QUESO=ON \
39+ -DDAKOTA_HAVE_GSL=ON \
40 -C${DAK_SRC}/cmake/BuildDakotaCustom.cmake \
41 -C${DAK_SRC}/cmake/DakotaDev.cmake \
42 ${DAK_SRC}
43Index: ../trunk-jpl/externalpackages/gsl/install-1.15-linux.sh
44===================================================================
45--- ../trunk-jpl/externalpackages/gsl/install-1.15-linux.sh (nonexistent)
46+++ ../trunk-jpl/externalpackages/gsl/install-1.15-linux.sh (revision 24810)
47@@ -0,0 +1,36 @@
48+#!/bin/bash
49+set -eu
50+
51+
52+# Constants
53+#
54+GSL_ROOT=${ISSM_DIR}/externalpackages/gsl
55+VER="1.15"
56+
57+# Cleanup=
58+rm -rf install src
59+mkdir install src
60+
61+# Download source
62+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/gsl-${VER}.tar.gz" "gsl-${VER}.tar.gz"
63+
64+# Unpack source
65+tar -zxvf gsl-${VER}.tar.gz
66+
67+# Move source to 'src' directory
68+mv gsl-${VER}/* src
69+rm -rf gsl-${VER}
70+
71+# Configure
72+cd src
73+./configure \
74+ --prefix="${GSL_ROOT}/install"
75+
76+# Compile and install
77+if [ $# -eq 0 ]; then
78+ make
79+ make install
80+else
81+ make -j $1
82+ make -j $1 install
83+fi
84
85Property changes on: ../trunk-jpl/externalpackages/gsl/install-1.15-linux.sh
86___________________________________________________________________
87Added: svn:executable
88## -0,0 +1 ##
89+*
90\ No newline at end of property
91Index: ../trunk-jpl/jenkins/ross-debian_linux-dakota
92===================================================================
93--- ../trunk-jpl/jenkins/ross-debian_linux-dakota (revision 24809)
94+++ ../trunk-jpl/jenkins/ross-debian_linux-dakota (revision 24810)
95@@ -22,8 +22,9 @@
96 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
97 --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
98 --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
99+ --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
100+ --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
101 --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
102- --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
103 --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
104 --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
105 --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
106@@ -38,6 +39,7 @@
107 autotools install-debian-linux.sh
108 cmake install.sh
109 petsc install-3.12-linux.sh
110+ gsl install-1.15-linux.sh
111 boost install-1.55-linux.sh
112 dakota install-6.2-linux.sh
113 triangle install-linux.sh
114Index: ../trunk-jpl/jenkins/ross-debian_linux-codipack
115===================================================================
116--- ../trunk-jpl/jenkins/ross-debian_linux-codipack (revision 24809)
117+++ ../trunk-jpl/jenkins/ross-debian_linux-codipack (revision 24810)
118@@ -21,11 +21,11 @@
119 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
120 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
121 --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
122+ --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
123 --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
124 --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
125 --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
126 --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \
127- --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
128 --with-medipack-dir="${ISSM_DIR}/externalpackages/medipack/install" \
129 --with-codipack-dir="${ISSM_DIR}/externalpackages/codipack/install" \
130 '
131@@ -38,11 +38,11 @@
132 autotools install-debian-linux.sh
133 cmake install.sh
134 petsc install-3.12-linux.sh
135+ gsl install-1.15-linux.sh
136 triangle install-linux.sh
137 chaco install.sh
138 m1qn3 install.sh
139 semic install.sh
140- gsl install-linux64.sh
141 medipack install.sh
142 codipack install.sh
143 shell2junit install.sh
Note: See TracBrowser for help on using the repository browser.