Changeset 19409

Timestamp:

06/18/15 11:24:09 (10 years ago)

Author:

schlegel

Message:

CHG: update patch for new mpi

Location:

issm/trunk-jpl/externalpackages/dakota/configs/5.3.1

Files:

• BuildDakotaCustom.cmake.patch (modified) (1 diff)
• CMakeLists.txt.pfe.patch (modified) (1 diff)

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

@@ -13 +13 @@
 ---
 > set(BOOST_ROOT
->     "$ENV{ISSM_DIR}/externalpackages/boost/install"
+>     "/nasa/boost/1.50.0"
 >     CACHE PATH "Use non-standard Boost install" FORCE)
 > set( Boost_NO_SYSTEM_PATHS TRUE

issm/trunk-jpl/externalpackages/dakota/configs/5.3.1/CMakeLists.txt.pfe.patch

@@ -3 +3 @@
 ---
 > # TODO: Can't this be integrated into the following logic?
-> set(BLAS_LIBS "-L/nasa/intel/mkl/10.0.011/lib/em64t/ -lmkl -lmkl_lapack -liomp5 -lpthread")
-> set(LAPACK_LIBS "-L/nasa/intel/mkl/10.0.011/lib/em64t/ -lmkl -lmkl_lapack -liomp5 -lpthread")
+> set(BLAS_LIBS "-L/nasa/intel/Compiler/2015.0.090/composer_xe_2015.0.090/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm")
+> set(LAPACK_LIBS "-L/nasa/intel/Compiler/2015.0.090/composer_xe_2015.0.090/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm")