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 #2685 from blattms/fix-owner-cells-not-first

Browse Source 
Alternative fix running in parallel with --owner-cells-first=false
This commit is contained in:
Atgeirr Flø Rasmussen
2020-06-25 00:29:58 +02:00
committed by GitHub
parent d3efb01e89 27c9ed5c85
commit 7a69db02de
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opm/simulators/linalg/ISTLSolverEbos.hpp
View File

@@ -509,7 +509,7 @@ protected:
if ( ownersFirst_ && !parameters_.linear_solver_use_amg_ && !useFlexible_) {
typedef WellModelGhostLastMatrixAdapter< Matrix, Vector, Vector, WellModel, true > Operator;
assert(matrix_);
Operator opA(*matrix_, wellModel, interiorCellNum_);
Operator opA(getMatrix(), wellModel, interiorCellNum_);
solve( opA, x, *rhs_, *comm_ );
}
@@ -517,8 +517,7 @@ protected:
typedef WellModelMatrixAdapter< Matrix, Vector, Vector, WellModel, true > Operator;
assert (noGhostMat_);
copyJacToNoGhost(*matrix_, *noGhostMat_);
Operator opA(*noGhostMat_, wellModel,
Operator opA(getMatrix(), wellModel,
comm_ );
solve( opA, x, *rhs_, *comm_ );
@@ -528,7 +527,7 @@ protected:
else
{
typedef WellModelMatrixAdapter< Matrix, Vector, Vector, WellModel, false > Operator;
Operator opA(*matrix_, wellModel);
Operator opA(getMatrix(), wellModel);
solve( opA, x, *rhs_ );
}
@@ -905,10 +904,10 @@ protected:
if (isParallel()) {
#if HAVE_MPI
assert(noGhostMat_);
flexibleSolver_.reset(new FlexibleSolverType(*noGhostMat_, *comm_, prm_, weightsCalculator));
flexibleSolver_.reset(new FlexibleSolverType(getMatrix(), *comm_, prm_, weightsCalculator));
#endif
} else {
flexibleSolver_.reset(new FlexibleSolverType(*matrix_, prm_, weightsCalculator));
flexibleSolver_.reset(new FlexibleSolverType(getMatrix(), prm_, weightsCalculator));
}
}
else