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

counting well iterations correctly.

Browse Source
This commit is contained in:
Liu Ming 2016-07-13 09:00:15 +08:00
parent bb0164f39f
commit 6af9aee20f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/autodiff/NonlinearSolver_impl.hpp
View File

@ -139,8 +139,6 @@ namespace Opm
linIters += report.linear_iterations; linIters += report.linear_iterations;
if (report.well_iterations != std::numeric_limits<int>::min()) { if (report.well_iterations != std::numeric_limits<int>::min()) {
wellIters += report.well_iterations; wellIters += report.well_iterations;
} else {
wellIters = report.well_iterations;
} }
++iteration; ++iteration;
} while ( (!converged && (iteration <= maxIter())) || (iteration <= minIter())); } while ( (!converged && (iteration <= maxIter())) || (iteration <= minIter()));
@ -154,10 +152,16 @@ namespace Opm
linearIterations_ += linIters; linearIterations_ += linIters;
nonlinearIterations_ += iteration - 1; // Since the last one will always be trivial. nonlinearIterations_ += iteration - 1; // Since the last one will always be trivial.
wellIterations_ += wellIters; if (wellIters != 0) {
wellIterations_ += wellIters;
wellIterationsLast_ = wellIters;
}
if (wellIters == 0) {
wellIterations_ = std::numeric_limits<int>::min();
wellIterationsLast_ = std::numeric_limits<int>::min();
}
linearIterationsLast_ = linIters; linearIterationsLast_ = linIters;
nonlinearIterationsLast_ = iteration; nonlinearIterationsLast_ = iteration;
wellIterationsLast_ = wellIters;
// Do model-specific post-step actions. // Do model-specific post-step actions.
model_->afterStep(dt, reservoir_state, well_state); model_->afterStep(dt, reservoir_state, well_state);