OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-21 04:22:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

drop using statement for param_

Browse Source 
rather qualify member variable with this->
This commit is contained in:
Arne Morten Kvarving 2021-09-06 12:58:16 +02:00
parent 79d8cf90fd
commit 73be71bff5
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/wells/StandardWell.hpp
View File

@ -197,7 +197,7 @@ namespace Opm
/// \brief Wether the Jacobian will also have well contributions in it. /// \brief Wether the Jacobian will also have well contributions in it.
virtual bool jacobianContainsWellContributions() const override virtual bool jacobianContainsWellContributions() const override
{ {
return param_.matrix_add_well_contributions_; return this->param_.matrix_add_well_contributions_;
} }
virtual void gasLiftOptimizationStage1 ( virtual void gasLiftOptimizationStage1 (
@ -262,7 +262,6 @@ namespace Opm
protected: protected:
// protected member variables from the Base class // protected member variables from the Base class
using Base::param_;
using Base::well_efficiency_factor_; using Base::well_efficiency_factor_;
using Base::perf_depth_; using Base::perf_depth_;
using Base::well_cells_; using Base::well_cells_;

14
opm/simulators/wells/StandardWell_impl.hpp
View File

@ -870,8 +870,8 @@ namespace Opm
updatePrimaryVariablesNewton(const BVectorWell& dwells, updatePrimaryVariablesNewton(const BVectorWell& dwells,
const WellState& /* well_state */) const const WellState& /* well_state */) const
{ {
const double dFLimit = param_.dwell_fraction_max_; const double dFLimit = this->param_.dwell_fraction_max_;
const double dBHPLimit = param_.dbhp_max_rel_; const double dBHPLimit = this->param_.dbhp_max_rel_;
this->StdWellEval::updatePrimaryVariablesNewton(dwells, dFLimit, dBHPLimit); this->StdWellEval::updatePrimaryVariablesNewton(dwells, dFLimit, dBHPLimit);
updateExtraPrimaryVariables(dwells); updateExtraPrimaryVariables(dwells);
@ -1329,8 +1329,8 @@ namespace Opm
// For the polymer, energy and foam cases, there is one more mass balance equations of reservoir than wells // For the polymer, energy and foam cases, there is one more mass balance equations of reservoir than wells
assert((int(B_avg.size()) == num_components_) || has_polymer || has_energy || has_foam || has_brine || has_zFraction); assert((int(B_avg.size()) == num_components_) || has_polymer || has_energy || has_foam || has_brine || has_zFraction);
const double tol_wells = param_.tolerance_wells_; const double tol_wells = this->param_.tolerance_wells_;
const double maxResidualAllowed = param_.max_residual_allowed_; const double maxResidualAllowed = this->param_.max_residual_allowed_;
std::vector<double> res; std::vector<double> res;
ConvergenceReport report = this->StdWellEval::getWellConvergence(well_state, ConvergenceReport report = this->StdWellEval::getWellConvergence(well_state,
@ -1559,7 +1559,7 @@ namespace Opm
{ {
if (!this->isOperable() && !this->wellIsStopped()) return; if (!this->isOperable() && !this->wellIsStopped()) return;
if ( param_.matrix_add_well_contributions_ ) if (this->param_.matrix_add_well_contributions_)
{ {
// Contributions are already in the matrix itself // Contributions are already in the matrix itself
return; return;
@ -2241,7 +2241,7 @@ namespace Opm
// checking the convergence of the extra equations related to polymer injectivity // checking the convergence of the extra equations related to polymer injectivity
if constexpr (Base::has_polymermw) { if constexpr (Base::has_polymermw) {
this->checkConvergencePolyMW(res, report, param_.max_residual_allowed_); this->checkConvergencePolyMW(res, report, this->param_.max_residual_allowed_);
} }
} }
@ -2373,7 +2373,7 @@ namespace Opm
const GroupState& group_state, const GroupState& group_state,
DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
const int max_iter = param_.max_inner_iter_wells_; const int max_iter = this->param_.max_inner_iter_wells_;
int it = 0; int it = 0;
bool converged; bool converged;
do { do {