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 #540 from atgeirr/remember-asimpl

Browse Source 
Add asImpl() to method calls.
This commit is contained in:
Bård Skaflestad 2015-11-19 14:47:13 +01:00
commit c956494402
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -245,11 +245,12 @@ namespace detail {
current_relaxation_ = 1.0;
dx_old_ = V::Zero(sizeNonLinear());
}
assemble(reservoir_state, well_state, iteration == 0);
residual_norms_history_.push_back(computeResidualNorms());
const bool converged = getConvergence(dt, iteration);
asImpl().assemble(reservoir_state, well_state, iteration == 0);
residual_norms_history_.push_back(asImpl().computeResidualNorms());
const bool converged = asImpl().getConvergence(dt, iteration);
if (!converged) {
V dx = solveJacobianSystem();
// Compute the nonlinear update.
V dx = asImpl().solveJacobianSystem();
// Stabilize the nonlinear update.
bool isOscillate = false;
@ -267,10 +268,10 @@ namespace detail {
// Apply the update, applying model-dependent
// limitations and chopping of the update.
updateState(dx, reservoir_state, well_state);
asImpl().updateState(dx, reservoir_state, well_state);
}
const bool failed = false; // Not needed in this model.
const int linear_iters = converged ? 0 : linearIterationsLastSolve();
const int linear_iters = converged ? 0 : asImpl().linearIterationsLastSolve();
return IterationReport{ failed, converged, linear_iters };
}