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

remove wellIterationsLast_.

Browse Source
This commit is contained in:
Liu Ming 2016-07-18 09:02:30 +08:00
parent b43cbe0531
commit 52d51e8565
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/NonlinearSolver.hpp
View File

@ -117,9 +117,6 @@ 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().
int wellIterationsLastStep() const;
/// Reference to physical model. /// Reference to physical model.
const PhysicalModel& model() const; const PhysicalModel& model() const;
@ -160,7 +157,6 @@ namespace Opm {
int wellIterations_; int wellIterations_;
int nonlinearIterationsLast_; int nonlinearIterationsLast_;
int linearIterationsLast_; int linearIterationsLast_;
int wellIterationsLast_;
}; };
} // namespace Opm } // namespace Opm

10
opm/autodiff/NonlinearSolver_impl.hpp
View File

@ -36,8 +36,7 @@ namespace Opm
linearIterations_(0), linearIterations_(0),
wellIterations_(0), wellIterations_(0),
nonlinearIterationsLast_(0), nonlinearIterationsLast_(0),
linearIterationsLast_(0), linearIterationsLast_(0)
wellIterationsLast_(0)
{ {
if (!model_) { if (!model_) {
OPM_THROW(std::logic_error, "Must provide a non-null model argument for NonlinearSolver."); OPM_THROW(std::logic_error, "Must provide a non-null model argument for NonlinearSolver.");
@ -86,12 +85,6 @@ namespace Opm
return linearIterationsLast_; return linearIterationsLast_;
} }
template <class PhysicalModel>
int NonlinearSolver<PhysicalModel>::wellIterationsLastStep() const
{
return wellIterationsLast_;
}
template <class PhysicalModel> template <class PhysicalModel>
int int
@ -151,7 +144,6 @@ 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;
wellIterationsLast_ = wellIters;
linearIterationsLast_ = linIters; linearIterationsLast_ = linIters;
nonlinearIterationsLast_ = iteration; nonlinearIterationsLast_ = iteration;