Changeset 19695

Timestamp:

11/05/15 11:52:36 (9 years ago)

Author:

schlegel

Message:

CHG: validate install for pfe dakota 6.2

Location:

issm/trunk-jpl/externalpackages/dakota

Files:

• configs/6.2/BuildDakotaCustom.cmake.pfe.patch (modified) (1 diff)
• install-6.2-pleiades.sh (moved) (moved from issm/trunk-jpl/externalpackages/dakota/install-6.2-pfe.sh ) (2 diffs)

issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.pfe.patch

@@ -1 @@
-64,65c64,65
-< #set( DAKOTA_HAVE MPI ON
-< #     CACHE BOOL "Build with MPI enabled" FORCE)
----
-> set( DAKOTA_HAVE MPI OFF
->      CACHE BOOL "Build with MPI disabled" FORCE)
+67a68,75
+> set( DAKOTA_HAVE_MPI ON
+>  CACHE BOOL "Always build with MPI enabled" FORCE)
+> set( MPI_INCLUDE_PATH
+>  "$ENV{ISSM_DIR}/externalpackages/mpich/install/include"
+>  CACHE FILEPATH "Use installed MPI headers" FORCE)
+> set( MPI_LIBRARY
+>  "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.so"
+>  CACHE FILEPATH "Use installed MPI library" FORCE)
 73,77c73,77
 < #set(BOOST_ROOT

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

@@ -26 +26 @@
 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.pfe.patch
 patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
-patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.pfe.patc
+patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.pfe.patch
 
 #Apply patches
@@ -38 +38 @@
 cmake -D CMAKE_C_COMPILER=mpicc \
            -D CMAKE_CXX_COMPILER=mpicxx \
-           -D CMAKE_Fortran_COMPILER=mpif77 \
+           -D CMAKE_Fortran_COMPILER=/usr/bin/gfortran \
                 -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \
                 -C $DAK_SRC/cmake/DakotaDev.cmake \