Merge pull request #1251 from norihiro-w/rm-eigenlis

delete OGS_USE_EIGENLIS

CMakeLists.txt

@@ -64,8 +64,6 @@ option(OGS_NO_EXTERNAL_LIBS "Builds OGS without any external dependencies." OFF)
 # Linear solvers
 option(OGS_USE_LIS "Use Lis" OFF)
 
-option(OGS_USE_EIGENLIS "Use Lis solver together with Eigen sparse matrices" OFF)
-
 # Parallel computing: vector and matrix algebraic caculation, solvers
 option(OGS_USE_PETSC "Use PETSc routines" OFF)
 
@@ -146,17 +144,6 @@ if(OGS_USE_EIGEN)
     add_definitions(-DOGS_USE_EIGEN)
 endif()
 
-if (OGS_USE_EIGENLIS)
-    if (NOT OGS_USE_EIGEN)
-        message(FATAL_ERROR "OGS_USE_EIGENLIS needs OGS_USE_EIGEN to be set!")
-    endif()
-    if (NOT OGS_USE_LIS)
-        message(FATAL_ERROR "OGS_USE_EIGENLIS needs OGS_USE_LIS to be set!")
-    endif()
-
-    add_definitions(-DOGS_USE_EIGENLIS)
-endif()
-
 if(OGS_BUILD_TESTS)
     set(Data_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Tests/Data CACHE INTERNAL "")
     set(Data_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Tests/Data CACHE INTERNAL "")

MathLib/CMakeLists.txt

@@ -28,9 +28,6 @@ endif()
 if(OGS_USE_LIS)
     GET_SOURCE_FILES(SOURCES_LINALG_LIS LinAlg/Lis)
     set(SOURCES ${SOURCES} ${SOURCES_LINALG_LIS})
-endif()
-
-if(OGS_USE_EIGEN AND OGS_USE_LIS)
     GET_SOURCE_FILES(SOURCES_LINALG_EIGENLIS LinAlg/EigenLis)
     set(SOURCES ${SOURCES} ${SOURCES_LINALG_EIGENLIS})
 endif()

MathLib/LinAlg/GlobalMatrixVectorTypes.h

@@ -15,7 +15,7 @@
 //
 // Global vector/matrix types and linear solver.
 //
-#if defined(OGS_USE_EIGENLIS)
+#if defined(OGS_USE_LIS)
 
     #include "MathLib/LinAlg/Eigen/EigenMatrix.h"
     #include "MathLib/LinAlg/Eigen/EigenVector.h"

MathLib/LinAlg/LinearSolver.cpp

@@ -93,7 +93,7 @@ SPECIALIZE_CREATE_LINEAR_SOLVER(Eigen::MatrixXd, Eigen::VectorXd,
 #endif
 
 
-#ifdef OGS_USE_EIGENLIS
+#ifdef OGS_USE_LIS
 
 #include "MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h"