OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1035 from akva2/revert_umfpack

Browse Source 
Revert "Check for HAVE_UMFPACK in LinearSolverFactory"
This commit is contained in:
Bård Skaflestad 2016-06-13 12:37:58 +02:00 committed by GitHub
commit bbd6a5f03d
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>
#if HAVE_UMFPACK
#if HAVE_SUITESPARSE_UMFPACK_H
#include <opm/core/linalg/LinearSolverUmfpack.hpp>
#endif
@ -45,7 +45,7 @@ namespace Opm
LinearSolverFactory::LinearSolverFactory()
{
#if HAVE_UMFPACK
#if HAVE_SUITESPARSE_UMFPACK_H
solver_.reset(new LinearSolverUmfpack);
#elif HAVE_DUNE_ISTL
solver_.reset(new LinearSolverIstl);
@ -65,7 +65,7 @@ namespace Opm
param.getDefault<std::string>("linsolver", "umfpack");
if (ls == "umfpack") {
#if HAVE_UMFPACK
#if HAVE_SUITESPARSE_UMFPACK_H
solver_.reset(new LinearSolverUmfpack);
#endif
}