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 #758 from qilicun/fix-wellIterations-bugs

Browse Source 
fix well iterations counting bugs.
This commit is contained in:
Bård Skaflestad 2016-07-20 11:20:28 +02:00 committed by GitHub
commit 01ec7befb4
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -775,7 +775,7 @@ namespace detail {
asImpl().assembleMassBalanceEq(state); asImpl().assembleMassBalanceEq(state);
// -------- Well equations ---------- // -------- Well equations ----------
IterationReport iter_report = {false, false, 0, std::numeric_limits<int>::min()}; IterationReport iter_report = {false, false, 0, 0};
if ( ! wellsActive() ) { if ( ! wellsActive() ) {
return iter_report; return iter_report;
} }

2
opm/autodiff/BlackoilMultiSegmentModel_impl.hpp
View File

@ -182,7 +182,7 @@ namespace Opm {
asImpl().assembleMassBalanceEq(state); asImpl().assembleMassBalanceEq(state);
// -------- Well equations ---------- // -------- Well equations ----------
IterationReport iter_report = {false, false, 0, std::numeric_limits<int>::min()}; IterationReport iter_report = {false, false, 0, 0};
if ( ! wellsActive() ) { if ( ! wellsActive() ) {
return iter_report; return iter_report;
} }

2
opm/autodiff/BlackoilTransportModel.hpp
View File

@ -124,7 +124,7 @@ namespace Opm {
asImpl().assembleMassBalanceEq(state); asImpl().assembleMassBalanceEq(state);
// -------- Well equations ---------- // -------- Well equations ----------
IterationReport iter_report = {false, false, 0, std::numeric_limits<int>::min()}; IterationReport iter_report = {false, false, 0, 0};
if ( ! wellsActive() ) { if ( ! wellsActive() ) {
return iter_report; return iter_report;
} }

2
opm/autodiff/NonlinearSolver.hpp
View File

@ -117,7 +117,7 @@ namespace Opm {
/// Number of linear solver iterations used in the last call to step(). /// Number of linear solver iterations used in the last call to step().
int linearIterationsLastStep() const; int linearIterationsLastStep() const;
/// Number of well iterations used in the last call to step(). /// Number of well iterations used in all calls to step().
int wellIterationsLastStep() const; int wellIterationsLastStep() const;
/// Reference to physical model. /// Reference to physical model.

3
opm/autodiff/NonlinearSolver_impl.hpp
View File

@ -92,7 +92,6 @@ namespace Opm
return wellIterationsLast_; return wellIterationsLast_;
} }
template <class PhysicalModel> template <class PhysicalModel>
int int
NonlinearSolver<PhysicalModel>:: NonlinearSolver<PhysicalModel>::
@ -150,7 +149,7 @@ 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; wellIterations_ += wellIters;
linearIterationsLast_ = linIters; linearIterationsLast_ = linIters;
nonlinearIterationsLast_ = iteration; nonlinearIterationsLast_ = iteration;
wellIterationsLast_ = wellIters; wellIterationsLast_ = wellIters;

2
opm/autodiff/SimulatorBase_impl.hpp
View File

@ -213,7 +213,7 @@ namespace Opm
{ {
std::ostringstream iter_msg; std::ostringstream iter_msg;
iter_msg << "Stepsize " << (double)unit::convert::to(timer.currentStepLength(), unit::day); iter_msg << "Stepsize " << (double)unit::convert::to(timer.currentStepLength(), unit::day);
if (solver->wellIterations() != std::numeric_limits<int>::min()) { if (solver->wellIterations() != 0) {
iter_msg << " days well iterations = " << solver->wellIterations() << ", "; iter_msg << " days well iterations = " << solver->wellIterations() << ", ";
} }
iter_msg << "non-linear iterations = " << solver->nonlinearIterations() iter_msg << "non-linear iterations = " << solver->nonlinearIterations()