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

Merge pull request #1319 from GitPaean/throw_when_no_umfpack

Browse Source 
removing more HAVE_UMFAPACK related in MultisegmentWell_impl
This commit is contained in:
Atgeirr Flø Rasmussen
2017-11-07 14:41:52 +01:00
committed by GitHub
parent f886a3f0ff 89416720cb
commit c79dab27d5
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/autodiff/MultisegmentWell_impl.hpp
View File

@@ -628,11 +628,7 @@ namespace Opm
// resWell = resWell - B * x // resWell = resWell - B * x
duneB_.mmv(x, resWell); duneB_.mmv(x, resWell);
// xw = D^-1 * resWell // xw = D^-1 * resWell
#if HAVE_UMFPACK
xw = mswellhelpers::invDXDirect(duneD_, resWell); xw = mswellhelpers::invDXDirect(duneD_, resWell);
#else
xw = mswellhelpers::invDX(duneD_, resWell);
#endif // HAVE_UMFPACK
} }
@@ -644,13 +640,9 @@ namespace Opm
MultisegmentWell<TypeTag>:: MultisegmentWell<TypeTag>::
solveEqAndUpdateWellState(WellState& well_state) solveEqAndUpdateWellState(WellState& well_state)
{ {
#if HAVE_UMFPACK
// We assemble the well equations, then we check the convergence, // We assemble the well equations, then we check the convergence,
// which is why we do not put the assembleWellEq here. // which is why we do not put the assembleWellEq here.
const BVectorWell dx_well = mswellhelpers::invDXDirect(duneD_, resWell_); const BVectorWell dx_well = mswellhelpers::invDXDirect(duneD_, resWell_);
#else
const BVectorWell dx_well = mswellhelpers::invDX(duneD_, resWell_);
#endif
updateWellState(dx_well, false, well_state); updateWellState(dx_well, false, well_state);
} }
@@ -1752,11 +1744,7 @@ namespace Opm
assembleWellEqWithoutIteration(ebosSimulator, dt, well_state, true); assembleWellEqWithoutIteration(ebosSimulator, dt, well_state, true);
#if HAVE_UMFPACK
const BVectorWell dx_well = mswellhelpers::invDXDirect(duneD_, resWell_); const BVectorWell dx_well = mswellhelpers::invDXDirect(duneD_, resWell_);
#else
const BVectorWell dx_well = mswellhelpers::invDX(duneD_, resWell_);
#endif
// TODO: use these small values for now, not intend to reach the convergence // TODO: use these small values for now, not intend to reach the convergence
// in this stage, but, should we? // in this stage, but, should we?