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

Changing the location of & when defining reference.

Browse Source
This commit is contained in:
Kai Bao 2014-05-23 11:39:26 +02:00
parent 1da24f3c3c
commit 9fe98514c0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@ -283,11 +283,11 @@ namespace Opm {
/// residual mass balance (tol_cnv). /// residual mass balance (tol_cnv).
bool getConvergence(const double dt); bool getConvergence(const double dt);
void detectNewtonOscillations(const std::vector<std::vector<double>> &residual_history, void detectNewtonOscillations(const std::vector<std::vector<double>>& residual_history,
const int it, const double relaxRelTol, const int it, const double relaxRelTol,
bool &oscillate, bool &stagnate) const; bool& oscillate, bool& stagnate) const;
void stablizeNewton(V &dx, V &dxOld, const double omega, const RelaxType relax_type) const; void stablizeNewton(V& dx, V& dxOld, const double omega, const RelaxType relax_type) const;
double dpMaxRel() const { return dp_max_rel_; } double dpMaxRel() const { return dp_max_rel_; }
double dsMax() const { return ds_max_; } double dsMax() const { return ds_max_; }

6
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -1705,9 +1705,9 @@ namespace {
template<class T> template<class T>
void void
FullyImplicitBlackoilSolver<T>::detectNewtonOscillations(const std::vector<std::vector<double>> &residual_history, FullyImplicitBlackoilSolver<T>::detectNewtonOscillations(const std::vector<std::vector<double>>& residual_history,
const int it, const double relaxRelTol, const int it, const double relaxRelTol,
bool &oscillate, bool &stagnate) const bool& oscillate, bool& stagnate) const
{ {
// The detection of oscillation in two primary variable results in the report of the detection // The detection of oscillation in two primary variable results in the report of the detection
// of oscillation for the solver. // of oscillation for the solver.
@ -1744,7 +1744,7 @@ namespace {
template<class T> template<class T>
void void
FullyImplicitBlackoilSolver<T>::stablizeNewton(V &dx, V &dxOld, const double omega, FullyImplicitBlackoilSolver<T>::stablizeNewton(V& dx, V& dxOld, const double omega,
const RelaxType relax_type) const { const RelaxType relax_type) const {
const V tempDxOld = dxOld; const V tempDxOld = dxOld;
dxOld = dx; dxOld = dx;