mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
BlackoilModel: rename ebosJac to jacobian
This commit is contained in:
parent
5e4c5e8174
commit
1f24fb1a35
@ -628,8 +628,7 @@ namespace Opm {
|
|||||||
/// r is the residual.
|
/// r is the residual.
|
||||||
void solveJacobianSystem(BVector& x)
|
void solveJacobianSystem(BVector& x)
|
||||||
{
|
{
|
||||||
|
auto& jacobian = simulator_.model().linearizer().jacobian().istlMatrix();
|
||||||
auto& ebosJac = simulator_.model().linearizer().jacobian().istlMatrix();
|
|
||||||
auto& ebosResid = simulator_.model().linearizer().residual();
|
auto& ebosResid = simulator_.model().linearizer().residual();
|
||||||
auto& ebosSolver = simulator_.model().newtonMethod().linearSolver();
|
auto& ebosSolver = simulator_.model().newtonMethod().linearSolver();
|
||||||
|
|
||||||
@ -650,7 +649,7 @@ namespace Opm {
|
|||||||
BVector x0(x);
|
BVector x0(x);
|
||||||
ebosSolver.setActiveSolver(solver);
|
ebosSolver.setActiveSolver(solver);
|
||||||
perfTimer.start();
|
perfTimer.start();
|
||||||
ebosSolver.prepare(ebosJac, ebosResid);
|
ebosSolver.prepare(jacobian, ebosResid);
|
||||||
setupTimes[solver] = perfTimer.stop();
|
setupTimes[solver] = perfTimer.stop();
|
||||||
perfTimer.reset();
|
perfTimer.reset();
|
||||||
ebosSolver.setResidual(ebosResid);
|
ebosSolver.setResidual(ebosResid);
|
||||||
@ -677,7 +676,7 @@ namespace Opm {
|
|||||||
|
|
||||||
Dune::Timer perfTimer;
|
Dune::Timer perfTimer;
|
||||||
perfTimer.start();
|
perfTimer.start();
|
||||||
ebosSolver.prepare(ebosJac, ebosResid);
|
ebosSolver.prepare(jacobian, ebosResid);
|
||||||
linear_solve_setup_time_ = perfTimer.stop();
|
linear_solve_setup_time_ = perfTimer.stop();
|
||||||
ebosSolver.setResidual(ebosResid);
|
ebosSolver.setResidual(ebosResid);
|
||||||
// actually, the error needs to be calculated after setResidual in order to
|
// actually, the error needs to be calculated after setResidual in order to
|
||||||
|
Loading…
Reference in New Issue
Block a user