Changeset 20293

Timestamp:

03/03/16 20:00:41 (9 years ago)

Author:

glperez

Message:

CHG: Modified Dakota flags to fall in line with the 6.2 MacOSX script.
CHG: Modified Boost 1.55 MacOSX El Capitan (10.11) install script. Now using XCode compilers
DEL: Removed Dakota 6.2 install script for MacOSX El Capitan (10.11).
CHG: Modified Dakota 6.2 install script for MacOSX. Provided options for delayed template parsing and disabled JEGA and Acro packages. These packages are not neede, yet cause compilation problems when using XCode toolchain.
CHG: Jenkins Pine Island config now uses different externalpackages (Dakota 6.2 MacOSX, Boost 1.55 MacOSX El Capitan (10.11)). Also, added Boost and Dakota options to config.

Location:

issm/trunk-jpl

Files:

• externalpackages/boost/install-1.55-macosx-el_capitan.sh (modified) (1 diff)
• externalpackages/dakota/install-6.2-macosx-el_capitan.sh (deleted)
• externalpackages/dakota/install-6.2-macosx64.sh (modified) (1 diff)
• jenkins/macosx_pine-island_dakota (modified) (4 diffs)
• m4/issm_options.m4 (modified) (1 diff)

issm/trunk-jpl/externalpackages/boost/install-1.55-macosx-el_capitan.sh

@@ -36 +36 @@
 #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: 

issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx64.sh

@@ -45 +45 @@
         -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 \

issm/trunk-jpl/jenkins/macosx_pine-island_dakota

@@ -15 +15 @@
         --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 +23 @@
 
 #MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
+MATLAB_PATH="/Applications/MATLAB_R2015a.app/"
 
 #PYTHON and MATLAB testing
@@ -50 +52 @@
 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 +58 @@
                                                 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"
 

issm/trunk-jpl/m4/issm_options.m4

@@ -526 +526 @@
                                         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])