![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 24945
- Timestamp:
- 06/01/20 11:03:22 (5 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 3 edited
-
jenkins/ross-debian_linux-solid_earth (modified) (1 diff)
-
m4/issm_options.m4 (modified) (7 diffs)
-
src/m/mesh/planet/gmsh/gmshplanet.m (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth
r24919 r24945 24 24 --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \ 25 25 --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \ 26 --with-gmsh-dir=${ISSM_DIR}/externalpackages/gmsh/install \ 26 27 ' 27 28 -
issm/trunk-jpl/m4/issm_options.m4
r24942 r24945 557 557 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" 558 558 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" 559 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [ disabling DAKOTA_CONFIG_H])559 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H]) 560 560 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling parallel MPI]) 561 561 else … … 569 569 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" 570 570 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" 571 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [ disabling DAKOTA_CONFIG_H])571 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H]) 572 572 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI]) 573 573 elif test "${DAKOTA_VERSION}" == "6.1" || test "${DAKOTA_VERSION}" == "6.2"; then … … 578 578 DAKOTALIB+=" ${BLASLAPACKLIB}" 579 579 fi 580 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [ disabling DAKOTA_CONFIG_H])580 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H]) 581 581 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI]) 582 582 elif test "${DAKOTA_VERSION}" == "6.11"; then … … 590 590 fi 591 591 fi 592 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [ disabling DAKOTA_CONFIG_H])592 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H]) 593 593 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI]) 594 594 else … … 602 602 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" 603 603 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" 604 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [ disabling DAKOTA_CONFIG_H])604 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H]) 605 605 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI]) 606 606 elif test "${DAKOTA_VERSION}" == "6.1" || test "${DAKOTA_VERSION}" == "6.2"; then … … 611 611 DAKOTALIB+=" ${BLASLAPACKLIB}" 612 612 fi 613 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [ disabling DAKOTA_CONFIG_H])613 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H]) 614 614 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI]) 615 615 elif test "${DAKOTA_VERSION}" == "6.11"; then … … 623 623 fi 624 624 fi 625 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [ disabling DAKOTA_CONFIG_H])625 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [enabling DAKOTA_CONFIG_H]) 626 626 AC_DEFINE([DAKOTA_HAVE_MPI], [1], [enabling Dakota with MPI]) 627 627 else -
issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.m
r24942 r24945 16 16 17 17 % Get Gmsh version 18 18 gmshmajorversion = IssmConfig('_GMSH_VERSION_MAJOR_'); 19 19 20 20 if ~ismember([3,4],gmshmajorversion),
Note:
See TracChangeset
for help on using the changeset viewer.
