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 #748 from atgeirr/fix-minor-bug-and-warning

Browse Source 
Fix minor bug and warning
This commit is contained in:
Joakim Hove
2016-06-30 22:04:03 +02:00
committed by GitHub
parent 86b66863b4 895a1de3fc
commit 6fffc45e5a
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/FlowMain.hpp
View File

@@ -433,7 +433,7 @@ namespace Opm
if (param_.has("nosim")) { if (param_.has("nosim")) {
const bool nosim = param_.get<bool>("nosim"); const bool nosim = param_.get<bool>("nosim");
IOConfigPtr ioConfig = eclipse_state_->getIOConfig(); IOConfigPtr ioConfig = eclipse_state_->getIOConfig();
ioConfig->overrideNOSIM( true ); ioConfig->overrideNOSIM( nosim );
} }
} }

24
opm/autodiff/NonlinearSolver.hpp
View File

@@ -103,22 +103,22 @@ namespace Opm {
WellState& well_state); WellState& well_state);
/// Number of nonlinear solver iterations used in all calls to step(). /// Number of nonlinear solver iterations used in all calls to step().
unsigned int nonlinearIterations() const; int nonlinearIterations() const;
/// Number of linear solver iterations used in all calls to step(). /// Number of linear solver iterations used in all calls to step().
unsigned int linearIterations() const; int linearIterations() const;
/// Number of well iterations used in all calls to step(). /// Number of well iterations used in all calls to step().
unsigned int wellIterations() const; int wellIterations() const;
/// Number of nonlinear solver iterations used in the last call to step(). /// Number of nonlinear solver iterations used in the last call to step().
unsigned int nonlinearIterationsLastStep() const; int nonlinearIterationsLastStep() const;
/// Number of linear solver iterations used in the last call to step(). /// Number of linear solver iterations used in the last call to step().
unsigned int linearIterationsLastStep() const; int linearIterationsLastStep() const;
/// Number of well iterations used in the last call to step(). /// Number of well iterations used in the last call to step().
unsigned int wellIterationsLastStep() const; int wellIterationsLastStep() const;
/// Reference to physical model. /// Reference to physical model.
const PhysicalModel& model() const; const PhysicalModel& model() const;
@@ -155,12 +155,12 @@ namespace Opm {
// --------- Data members --------- // --------- Data members ---------
SolverParameters param_; SolverParameters param_;
std::unique_ptr<PhysicalModel> model_; std::unique_ptr<PhysicalModel> model_;
unsigned int nonlinearIterations_; int nonlinearIterations_;
unsigned int linearIterations_; int linearIterations_;
unsigned int wellIterations_; int wellIterations_;
unsigned int nonlinearIterationsLast_; int nonlinearIterationsLast_;
unsigned int linearIterationsLast_; int linearIterationsLast_;
unsigned int wellIterationsLast_; int wellIterationsLast_;
}; };
} // namespace Opm } // namespace Opm

12
opm/autodiff/NonlinearSolver_impl.hpp
View File

@@ -45,19 +45,19 @@ namespace Opm
} }
template <class PhysicalModel> template <class PhysicalModel>
unsigned int NonlinearSolver<PhysicalModel>::nonlinearIterations() const int NonlinearSolver<PhysicalModel>::nonlinearIterations() const
{ {
return nonlinearIterations_; return nonlinearIterations_;
} }
template <class PhysicalModel> template <class PhysicalModel>
unsigned int NonlinearSolver<PhysicalModel>::linearIterations() const int NonlinearSolver<PhysicalModel>::linearIterations() const
{ {
return linearIterations_; return linearIterations_;
} }
template <class PhysicalModel> template <class PhysicalModel>
unsigned int NonlinearSolver<PhysicalModel>::wellIterations() const int NonlinearSolver<PhysicalModel>::wellIterations() const
{ {
return wellIterations_; return wellIterations_;
} }
@@ -75,19 +75,19 @@ namespace Opm
} }
template <class PhysicalModel> template <class PhysicalModel>
unsigned int NonlinearSolver<PhysicalModel>::nonlinearIterationsLastStep() const int NonlinearSolver<PhysicalModel>::nonlinearIterationsLastStep() const
{ {
return nonlinearIterationsLast_; return nonlinearIterationsLast_;
} }
template <class PhysicalModel> template <class PhysicalModel>
unsigned int NonlinearSolver<PhysicalModel>::linearIterationsLastStep() const int NonlinearSolver<PhysicalModel>::linearIterationsLastStep() const
{ {
return linearIterationsLast_; return linearIterationsLast_;
} }
template <class PhysicalModel> template <class PhysicalModel>
unsigned int NonlinearSolver<PhysicalModel>::wellIterationsLastStep() const int NonlinearSolver<PhysicalModel>::wellIterationsLastStep() const
{ {
return wellIterationsLast_; return wellIterationsLast_;
} }