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 #1712 from andlaus/fix_ebos_convergence

Browse Source 
adapt to the new preparation procedure of ewoms linear solvers
This commit is contained in:
Atgeirr Flø Rasmussen
2019-01-21 14:54:09 +01:00
committed by GitHub
parent a689973760 2563a58db8
commit a00972dc0b
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilModelEbos.hpp
View File

@@ -481,7 +481,13 @@ namespace Opm {
x = 0.0;
auto& ebosSolver = ebosSimulator_.model().newtonMethod().linearSolver();
ebosSolver.prepare(ebosJac, ebosResid);
ebosSolver.prepare(ebosJac);
ebosSolver.setResidual(ebosResid);
// actually, the error needs to be calculated after setResidual in order to
// account for parallelization properly. since the residual of ECFV
// discretizations does not need to be synchronized across processes to be
// consistent, this is not relevant for OPM-flow...
ebosSolver.setJacobian(ebosJac);
ebosSolver.solve(x);
}

10
opm/autodiff/ISTLSolverEbos.hpp
View File

@@ -208,11 +208,17 @@ protected:
matrix_for_preconditioner_.reset();
}
void prepare(const SparseMatrixAdapter& M, Vector& b) {
matrix_ = &M.istlMatrix();
void prepare(const SparseMatrixAdapter& M) {
}
void setResidual(Vector& b) {
rhs_ = &b;
}
void setJacobian(const SparseMatrixAdapter& M) {
matrix_ = &M.istlMatrix();
}
bool solve(Vector& x) {
// Solve system.