Changeset 26337

Timestamp:

06/30/21 19:25:56 (4 years ago)

Author:

schlegel

Message:

CHG: update discover compile and dakota

Location:

issm/trunk-jpl

Files:

• externalpackages/dakota/install-6.2-discover.sh (moved) (moved from issm/trunk-jpl/externalpackages/dakota/install-6.2-intel20-discover.sh ) (1 diff)
• externalpackages/dakota/install-6.2-intel15-discover.sh (deleted)
• externalpackages/dakota/install-6.2-intel16-discover.sh (deleted)
• m4/issm_options.m4 (modified) (1 diff)

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

@@ -39 +39 @@
            -D CMAKE_CXX_COMPILER=mpicxx \
            -D CMAKE_Fortran_COMPILER=/usr/bin/gfortran \
-                -DHAVE_ACRO=off \
-                -DHAVE_JEGA=off \
+                -DBUILD_SHARED_LIBS=ON \
+                -DBUILD_STATIC_LIBS=OFF \
+                -DBoost_NO_BOOST_CMAKE=TRUE \
+                -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 \

issm/trunk-jpl/m4/issm_options.m4

@@ -291 +291 @@
                         export CFLAGS="-O3 -D_INTEL_LINUX_ -DMPICH_IGNORE_CXX_SEEK"
                 elif test "${VENDOR}" == "intel-discover"; then
-                        export CC=icc
-                        export CXX=icpc
-                        export CXXFLAGS="-O3 -D_INTEL_LINUX_ -DMPICH_IGNORE_CXX_SEEK"
+                   export CC=mpicc
+                   export CXX=mpicxx
+                        export CXXFLAGS="-O3 -D_INTEL_LINUX_ -DMPICH_IGNORE_CXX_SEEK -std=c++11"
                         export CFLAGS="-O3 -D_INTEL_LINUX_ -DMPICH_IGNORE_CXX_SEEK"
                 elif test "${VENDOR}" == "intel-pleiades"; then