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

giving more information when umfpack is not available.

Browse Source 
when calling invDXDirect.
This commit is contained in:
Kai Bao 2017-11-03 10:03:03 +01:00
parent 53942053af
commit 790db957f5
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/autodiff/MSWellHelpers.hpp
View File

@ -33,12 +33,12 @@ namespace Opm {
namespace mswellhelpers namespace mswellhelpers
{ {
#if HAVE_UMFPACK
// obtain y = D^-1 * x with a direct solver // obtain y = D^-1 * x with a direct solver
template <typename MatrixType, typename VectorType> template <typename MatrixType, typename VectorType>
VectorType VectorType
invDXDirect(const MatrixType& D, VectorType x) invDXDirect(const MatrixType& D, VectorType x)
{ {
#if HAVE_UMFPACK
VectorType y(x.size()); VectorType y(x.size());
y = 0.; y = 0.;
@ -61,8 +61,11 @@ namespace mswellhelpers
} }
return y; return y;
} #else
OPM_THROW(std::runtime_error, "Cannot use invDXDirect() without UMFPACK. "
"Reconfigure opm-simulator with SuiteSparse/UMFPACK support and recompile.");
#endif // HAVE_UMFPACK #endif // HAVE_UMFPACK
}

8
opm/autodiff/MultisegmentWell_impl.hpp
View File

@ -494,11 +494,7 @@ namespace Opm
duneB_.mv(x, Bx); duneB_.mv(x, Bx);
// invDBx = duneD^-1 * Bx_ // invDBx = duneD^-1 * Bx_
#if HAVE_UMFPACK
const BVectorWell invDBx = mswellhelpers::invDXDirect(duneD_, Bx); const BVectorWell invDBx = mswellhelpers::invDXDirect(duneD_, Bx);
#else
const BVectorWell invDBx = mswellhelpers::invDX(duneD_, Bx);
#endif
// Ax = Ax - duneC_^T * invDBx // Ax = Ax - duneC_^T * invDBx
duneC_.mmtv(invDBx,Ax); duneC_.mmtv(invDBx,Ax);
@ -514,11 +510,7 @@ namespace Opm
apply(BVector& r) const apply(BVector& r) const
{ {
// invDrw_ = duneD^-1 * resWell_ // invDrw_ = duneD^-1 * resWell_
#if HAVE_UMFPACK
const BVectorWell invDrw = mswellhelpers::invDXDirect(duneD_, resWell_); const BVectorWell invDrw = mswellhelpers::invDXDirect(duneD_, resWell_);
#else
const BVectorWell invDrw = mswellhelpers::invDX(duneD_, resWell_);
#endif // HAVE_UMFPACK
// r = r - duneC_^T * invDrw // r = r - duneC_^T * invDrw
duneC_.mmtv(invDrw, r); duneC_.mmtv(invDrw, r);
} }