From 2bbc296f810cff54f1fdea04c0b9ba441f12dfcb Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 26 Jan 2016 09:58:34 +0100
Subject: [PATCH] Renamed to OGS_EIGEN_DYNAMIC_SHAPE_MATRICES, Travis tests
dynamic, Jenkins static.
---
.travis.yml | 3 +--
CMakeLists.txt | 6 +++---
NumLib/Fem/ShapeMatrixPolicy.h | 3 ++-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2ecbfa2dc0f..05ab3a4c680 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,6 @@ env:
matrix:
- CASE=CLI CMAKE_ARGS="-DOGS_BUILD_GUI=OFF -DOGS_BUILD_UTILS=ON"
- CASE=GUI CMAKE_ARGS="-DOGS_BUILD_GUI=ON -DOGS_BUILD_CLI=OFF -DOGS_BUILD_TESTS=OFF"
- - CASE=CLI CMAKE_ARGS="-DOGS_EIGEN_DYNAMIC=ON -DCMAKE_BUILD_TYPE=Debug"
before_install:
- bash scripts/travis/cmake.sh
@@ -41,7 +40,7 @@ before_script:
script:
- mkdir build
- cd build
- - cmake $CMAKE_ARGS ..
+ - cmake $CMAKE_ARGS -DCMAKE_BUILD_TYPE=Debug -DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES=ON ..
- make -j 2
- if [[ "$CASE" == "CLI" ]]; then make tests; fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13e414bd9b0..334728a9246 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ option(OGS_USE_MPI "Use MPI" OFF)
# Eigen
option(OGS_USE_EIGEN "Use EIGEN for local matrix and vector" ON)
-option(OGS_EIGEN_DYNAMIC "Use dynamically allocated shape matrices" OFF)
+option(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES "Use dynamically allocated shape matrices" OFF)
option(EIGEN_NO_DEBUG "Disables Eigen's assertions" OFF)
# Logging
@@ -131,8 +131,8 @@ if(OGS_USE_EIGEN)
if (EIGEN_NO_DEBUG)
add_definitions(-DEIGEN_NO_DEBUG)
endif()
- if(OGS_EIGEN_DYNAMIC)
- add_definitions(-DEIGEN_DYNAMIC_MATRICES)
+ if(OGS_EIGEN_DYNAMIC_SHAPE_MATRICES)
+ add_definitions(-DOGS_EIGEN_DYNAMIC_SHAPE_MATRICES)
endif()
endif()
diff --git a/NumLib/Fem/ShapeMatrixPolicy.h b/NumLib/Fem/ShapeMatrixPolicy.h
index 47a5f06fd8f..028f08bfdf8 100644
--- a/NumLib/Fem/ShapeMatrixPolicy.h
+++ b/NumLib/Fem/ShapeMatrixPolicy.h
@@ -106,10 +106,11 @@ struct EigenDynamicShapeMatrixPolicy
};
/// Default choice of the ShapeMatrixPolicy.
+#if OGS_EIGEN_DYNAMIC_SHAPE_MATRICES
template <typename ShapeFunction, unsigned GlobalDim>
-#if EIGEN_DYNAMIC_MATRICES
using ShapeMatrixPolicyType = EigenDynamicShapeMatrixPolicy<ShapeFunction, GlobalDim>;
#else
+template <typename ShapeFunction, unsigned GlobalDim>
using ShapeMatrixPolicyType = EigenFixedShapeMatrixPolicy<ShapeFunction, GlobalDim>;
#endif
--
GitLab