OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 21:43:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Check for HAVE_UMFPACK in LinearSolverFactory"

Browse Source 
This reverts commit f54c74db0637640f5fb224fab243b294cd034f15.
This commit is contained in:
Arne Morten Kvarving 2016-06-13 10:43:21 +02:00
parent 84b0c8bc59
commit 33b29e9991
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/linalg/LinearSolverFactory.cpp
View File

@ -23,7 +23,7 @@
#include <opm/core/linalg/LinearSolverFactory.hpp> #include <opm/core/linalg/LinearSolverFactory.hpp>
#if HAVE_UMFPACK #if HAVE_SUITESPARSE_UMFPACK_H
#include <opm/core/linalg/LinearSolverUmfpack.hpp> #include <opm/core/linalg/LinearSolverUmfpack.hpp>
#endif #endif
@ -45,7 +45,7 @@ namespace Opm
LinearSolverFactory::LinearSolverFactory() LinearSolverFactory::LinearSolverFactory()
{ {
#if HAVE_UMFPACK #if HAVE_SUITESPARSE_UMFPACK_H
solver_.reset(new LinearSolverUmfpack); solver_.reset(new LinearSolverUmfpack);
#elif HAVE_DUNE_ISTL #elif HAVE_DUNE_ISTL
solver_.reset(new LinearSolverIstl); solver_.reset(new LinearSolverIstl);
@ -65,7 +65,7 @@ namespace Opm
param.getDefault<std::string>("linsolver", "umfpack"); param.getDefault<std::string>("linsolver", "umfpack");
if (ls == "umfpack") { if (ls == "umfpack") {
#if HAVE_UMFPACK #if HAVE_SUITESPARSE_UMFPACK_H
solver_.reset(new LinearSolverUmfpack); solver_.reset(new LinearSolverUmfpack);
#endif #endif
} }