OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow applyUMFPack to decompose if needed.

Browse Source
This commit is contained in:
Markus Blatt
2020-07-24 17:58:12 +02:00
parent a011244d9c
commit ce409737fe
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
opm/simulators/wells/MSWellHelpers.hpp
View File

@@ -42,8 +42,13 @@ namespace mswellhelpers
/// Applies umfpack and checks for singularity /// Applies umfpack and checks for singularity
template <typename MatrixType, typename VectorType> template <typename MatrixType, typename VectorType>
VectorType VectorType
applyUMFPack(Dune::UMFPack<MatrixType>& linsolver, VectorType x) applyUMFPack(const MatrixType& D, std::shared_ptr<Dune::UMFPack<MatrixType> >& linsolver, VectorType x)
{ {
if (!linsolver)
{
linsolver.reset(new Dune::UMFPack<MatrixType>(D, 0));
}
// The copy of x seems mandatory for calling UMFPack! // The copy of x seems mandatory for calling UMFPack!
VectorType y(x.size()); VectorType y(x.size());
y = 0.; y = 0.;
@@ -52,7 +57,7 @@ namespace mswellhelpers
Dune::InverseOperatorResult res; Dune::InverseOperatorResult res;
// Solve // Solve
linsolver.apply(y, x, res); linsolver->apply(y, x, res);
// Checking if there is any inf or nan in y // Checking if there is any inf or nan in y
// it will be the solution before we find a way to catch the singularity of the matrix // it will be the solution before we find a way to catch the singularity of the matrix
@@ -73,8 +78,8 @@ namespace mswellhelpers
invDXDirect(const MatrixType& D, VectorType x) invDXDirect(const MatrixType& D, VectorType x)
{ {
#if HAVE_UMFPACK #if HAVE_UMFPACK
Dune::UMFPack<MatrixType> linsolver(D, 0); std::shared_ptr<Dune::UMFPack<MatrixType> > linsolver;
return applyUMFPack(linsolver, x); return applyUMFPack(D, linsolver, x);
#else #else
// this is not thread safe // this is not thread safe
OPM_THROW(std::runtime_error, "Cannot use invDXDirect() without UMFPACK. " OPM_THROW(std::runtime_error, "Cannot use invDXDirect() without UMFPACK. "