Changeset 22613

Timestamp:

03/22/18 16:19:02 (7 years ago)

Author:

jdquinn

Message:

CHG: Stability improvements for Linux_Ubuntu_Dakota build.

Location:

issm/trunk-jpl

Files:

• externalpackages/dakota/configs/6.2/CMakeLists.txt.petsclibs.patch (modified) (1 diff)
• externalpackages/dakota/install-6.2-linux64.sh (modified) (1 diff)
• jenkins/linux64_ross_dakota (modified) (1 diff)

issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.petsclibs.patch

@@ -3 +3 @@
 ---
 > # TODO: Can't this be integrated into the following logic?
-> set(BLAS_LIBS "-L/u/astrid-r1b/schlegel/issm/trunk/externalpackages/petsc/install/lib/ -lfblas -L/usr/lib/gcc/x86_64-linux-gnu/4.8/ -lgfortran")
-> set(LAPACK_LIBS "-L/u/astrid-r1b/schlegel/issm/trunk/externalpackages/petsc/install/lib/ -lflapack -L/usr/lib/gcc/x86_64-linux-gnu/4.8/ -lgfortran")
+> set(BLAS_LIBS "-L$ENV{ISSM_DIR}/externalpackages/petsc/install/lib -lfblas -L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran") > set(LAPACK_LIBS "-L$ENV{ISSM_DIR}/externalpackages/petsc/install/lib -lflapack -L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran")

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

@@ -26 +26 @@
 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch
 patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
+patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.petsclibs.patch
 
 #Apply patches

issm/trunk-jpl/jenkins/linux64_ross_dakota

@@ -13 +13 @@
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
+        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
+        --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
-        --with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
-        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
+        --with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
+        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-numthreads=4 \
         --enable-development \
-        --enable-debugging '
+        --enable-debugging'
 
 #PYTHON and MATLAB testing