source: issm/oecreview/Archive/24684-25833/ISSM-24944-24945.diff@ 28275

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

CHG: added 24684-25833
File size: 8.5 KB
RevLine 
[25834]1Index: ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m
2===================================================================
3--- ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m (revision 24944)
4+++ ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m (revision 24945)
5@@ -15,7 +15,7 @@
6 % md.mesh=gmshplanet('radius',6000,'resolution',100);
7
8 % Get Gmsh version
9- gmshmajorversion = IssmConfig('_GMSH_VERSION_MAJOR_');
10+ gmshmajorversion = IssmConfig('_GMSH_VERSION_MAJOR_');
11
12 if ~ismember([3,4],gmshmajorversion),
13 error(['gmshplanet: Gmsh major version ' gmshmajorversion ' not supported!']);
14Index: ../trunk-jpl/jenkins/ross-debian_linux-solid_earth
15===================================================================
16--- ../trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 24944)
17+++ ../trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 24945)
18@@ -23,6 +23,7 @@
19 --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
20 --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
21 --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
22+ --with-gmsh-dir=${ISSM_DIR}/externalpackages/gmsh/install \
23 '
24
25 #-------------------#
26Index: ../trunk-jpl/m4/issm_options.m4
27===================================================================
28--- ../trunk-jpl/m4/issm_options.m4 (revision 24944)
29+++ ../trunk-jpl/m4/issm_options.m4 (revision 24945)
30@@ -556,7 +556,7 @@
31 elif test "${DAKOTA_VERSION}" == "6.1" || test "${DAKOTA_VERSION}" == "6.2"; then
32 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"
33 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"
34- AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])
35+ AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H])
36 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling parallel MPI])
37 else
38 AC_MSG_ERROR([Dakota version not found or version (${DAKOTA_VERSION}) not supported!]);
39@@ -568,7 +568,7 @@
40 elif test "${DAKOTA_VERSION}" == "5.3" || test "${DAKOTA_VERSION}" == "5.3.1"; then
41 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"
42 DAKOTALIB="-L${DAKOTA_ROOT}/lib -L${BOOST_ROOT}/lib -ldakota_src -lpecos_src -lscolib -ljega_fe -llhs -lpebbl -lcolin -linterfaces -lmods -lmoga -loptpp -lsampling -lsoga -lsurfpack -lutilib -lconmin -ldakota_src_fortran -lmod -lncsuopt -lsurfpack_fortran -lteuchos -l3po -lamplsolver -lanalyzer -lbose -lcport -ldace -ldfftpack -leutils -lfsudace -lhopspack -ljega -lnidr -lpecos -lpsuade -lrandom -ltinyxml -lutilities -lsparsegrid -lboost_signals -lboost_regex -lboost_filesystem -lboost_system"
43- AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])
44+ AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H])
45 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI])
46 elif test "${DAKOTA_VERSION}" == "6.1" || test "${DAKOTA_VERSION}" == "6.2"; then
47 if test "${BOOST_VERSION_MAJOR}" == "1"; then
48@@ -577,7 +577,7 @@
49 DAKOTALIB+=" -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system"
50 DAKOTALIB+=" ${BLASLAPACKLIB}"
51 fi
52- AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])
53+ AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H])
54 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI])
55 elif test "${DAKOTA_VERSION}" == "6.11"; then
56 if test "${BOOST_VERSION_MAJOR}" == "1"; then
57@@ -589,7 +589,7 @@
58 DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchosremainder -lteuchosnumerics -lteuchoscomm -lteuchosparameterlist -lteuchosparser -lteuchoscore -lpecos_util -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lapproxnn -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}"
59 fi
60 fi
61- AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])
62+ AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H])
63 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI])
64 else
65 AC_MSG_ERROR([Dakota version not found or version (${DAKOTA_VERSION}) not supported!]);
66@@ -601,7 +601,7 @@
67 elif test "${DAKOTA_VERSION}" == "5.3" || test "${DAKOTA_VERSION}" == "5.3.1"; then
68 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"
69 DAKOTALIB="-L${DAKOTA_ROOT}/lib -L${BOOST_ROOT}/lib -ldakota_src -lpecos_src -lscolib -ljega_fe -llhs -lpebbl -lcolin -linterfaces -lmods -lmoga -loptpp -lsampling -lsoga -lsurfpack -lutilib -lconmin -ldakota_src_fortran -lmod -lncsuopt -lsurfpack_fortran -lteuchos -l3po -lamplsolver -lanalyzer -lbose -lcport -ldace -ldfftpack -leutils -lfsudace -lhopspack -ljega -lnidr -lpecos -lpsuade -lrandom -ltinyxml -lutilities -lsparsegrid -lboost_signals -lboost_regex -lboost_filesystem -lboost_system"
70- AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])
71+ AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H])
72 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI])
73 elif test "${DAKOTA_VERSION}" == "6.1" || test "${DAKOTA_VERSION}" == "6.2"; then
74 if test "${BOOST_VERSION_MAJOR}" == "1"; then
75@@ -610,7 +610,7 @@
76 DAKOTALIB+=" -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system"
77 DAKOTALIB+=" ${BLASLAPACKLIB}"
78 fi
79- AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])
80+ AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H])
81 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI])
82 elif test "${DAKOTA_VERSION}" == "6.11"; then
83 if test "${BOOST_VERSION_MAJOR}" == "1"; then
84@@ -622,7 +622,7 @@
85 DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchosremainder -lteuchosnumerics -lteuchoscomm -lteuchosparameterlist -lteuchosparser -lteuchoscore -lpecos_util -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lapproxnn -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}"
86 fi
87 fi
88- AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])
89+ AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H])
90 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI])
91 else
92 AC_MSG_ERROR([Dakota version not found or version (${DAKOTA_VERSION}) not supported!]);
Note: See TracBrowser for help on using the repository browser.