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

drop using statement for well_ecl_

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 874a7a3830
commit 79d8cf90fd
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,7 +262,6 @@ namespace Opm
protected: protected:
// protected member variables from the Base class // protected member variables from the Base class
using Base::well_ecl_;
using Base::param_; using Base::param_;
using Base::well_efficiency_factor_; using Base::well_efficiency_factor_;
using Base::perf_depth_; using Base::perf_depth_;

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

@ -1688,7 +1688,7 @@ namespace Opm
auto& ws = well_state_copy.well(this->index_of_well_); auto& ws = well_state_copy.well(this->index_of_well_);
// Set current control to bhp, and bhp value in state, modify bhp limit in control object. // Set current control to bhp, and bhp value in state, modify bhp limit in control object.
if (well_ecl_.isInjector()) { if (this->well_ecl_.isInjector()) {
ws.injection_cmode = Well::InjectorCMode::BHP; ws.injection_cmode = Well::InjectorCMode::BHP;
} else { } else {
ws.production_cmode = Well::ProducerCMode::BHP; ws.production_cmode = Well::ProducerCMode::BHP;
@ -1697,7 +1697,7 @@ namespace Opm
// initialized the well rates with the potentials i.e. the well rates based on bhp // initialized the well rates with the potentials i.e. the well rates based on bhp
const int np = number_of_phases_; const int np = number_of_phases_;
const double sign = well_ecl_.isInjector() ? 1.0 : -1.0; const double sign = this->well_ecl_.isInjector() ? 1.0 : -1.0;
for (int phase = 0; phase < np; ++phase){ for (int phase = 0; phase < np; ++phase){
well_state_copy.wellRates(index_of_well_)[phase] well_state_copy.wellRates(index_of_well_)[phase]
= sign * ws.well_potentials[phase]; = sign * ws.well_potentials[phase];
@ -1733,9 +1733,9 @@ namespace Opm
std::vector<double> potentials(number_of_phases_, 0.0); std::vector<double> potentials(number_of_phases_, 0.0);
const auto& summary_state = ebos_simulator.vanguard().summaryState(); const auto& summary_state = ebos_simulator.vanguard().summaryState();
const auto& well = well_ecl_; const auto& well = this->well_ecl_;
if (well.isInjector()){ if (well.isInjector()){
const auto& controls = well_ecl_.injectionControls(summary_state); const auto& controls = this->well_ecl_.injectionControls(summary_state);
auto bhp_at_thp_limit = computeBhpAtThpLimitInj(ebos_simulator, summary_state, deferred_logger); auto bhp_at_thp_limit = computeBhpAtThpLimitInj(ebos_simulator, summary_state, deferred_logger);
if (bhp_at_thp_limit) { if (bhp_at_thp_limit) {
const double bhp = std::min(*bhp_at_thp_limit, controls.bhp_limit); const double bhp = std::min(*bhp_at_thp_limit, controls.bhp_limit);
@ -1770,7 +1770,7 @@ namespace Opm
auto bhp_at_thp_limit = computeBhpAtThpLimitProdWithAlq( auto bhp_at_thp_limit = computeBhpAtThpLimitProdWithAlq(
ebos_simulator, summary_state, deferred_logger, alq); ebos_simulator, summary_state, deferred_logger, alq);
if (bhp_at_thp_limit) { if (bhp_at_thp_limit) {
const auto& controls = well_ecl_.productionControls(summary_state); const auto& controls = this->well_ecl_.productionControls(summary_state);
bhp = std::max(*bhp_at_thp_limit, controls.bhp_limit); bhp = std::max(*bhp_at_thp_limit, controls.bhp_limit);
computeWellRatesWithBhpPotential(ebos_simulator, bhp, potentials, deferred_logger); computeWellRatesWithBhpPotential(ebos_simulator, bhp, potentials, deferred_logger);
} }
@ -1778,7 +1778,7 @@ namespace Opm
deferred_logger.warning("FAILURE_GETTING_CONVERGED_POTENTIAL", deferred_logger.warning("FAILURE_GETTING_CONVERGED_POTENTIAL",
"Failed in getting converged thp based potential calculation for well " "Failed in getting converged thp based potential calculation for well "
+ name() + ". Instead the bhp based value is used"); + name() + ". Instead the bhp based value is used");
const auto& controls = well_ecl_.productionControls(summary_state); const auto& controls = this->well_ecl_.productionControls(summary_state);
bhp = controls.bhp_limit; bhp = controls.bhp_limit;
computeWellRatesWithBhpPotential(ebos_simulator, bhp, potentials, deferred_logger); computeWellRatesWithBhpPotential(ebos_simulator, bhp, potentials, deferred_logger);
} }
@ -2045,7 +2045,7 @@ namespace Opm
DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
if constexpr (Base::has_polymermw) { if constexpr (Base::has_polymermw) {
const int water_table_id = well_ecl_.getPolymerProperties().m_skprwattable; const int water_table_id = this->well_ecl_.getPolymerProperties().m_skprwattable;
if (water_table_id <= 0) { if (water_table_id <= 0) {
OPM_DEFLOG_THROW(std::runtime_error, "Unused SKPRWAT table id used for well " << name(), deferred_logger); OPM_DEFLOG_THROW(std::runtime_error, "Unused SKPRWAT table id used for well " << name(), deferred_logger);
} }
@ -2079,7 +2079,7 @@ namespace Opm
if (poly_inj_conc == 0.) { if (poly_inj_conc == 0.) {
return sign * pskinwater(throughput, water_velocity_abs, deferred_logger); return sign * pskinwater(throughput, water_velocity_abs, deferred_logger);
} }
const int polymer_table_id = well_ecl_.getPolymerProperties().m_skprpolytable; const int polymer_table_id = this->well_ecl_.getPolymerProperties().m_skprpolytable;
if (polymer_table_id <= 0) { if (polymer_table_id <= 0) {
OPM_DEFLOG_THROW(std::runtime_error, "Unavailable SKPRPOLY table id used for well " << name(), deferred_logger); OPM_DEFLOG_THROW(std::runtime_error, "Unavailable SKPRPOLY table id used for well " << name(), deferred_logger);
} }
@ -2114,7 +2114,7 @@ namespace Opm
DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
if constexpr (Base::has_polymermw) { if constexpr (Base::has_polymermw) {
const int table_id = well_ecl_.getPolymerProperties().m_plymwinjtable; const int table_id = this->well_ecl_.getPolymerProperties().m_plymwinjtable;
const auto& table_func = PolymerModule::getPlymwinjTable(table_id); const auto& table_func = PolymerModule::getPlymwinjTable(table_id);
const EvalWell throughput_eval(this->numWellEq_ + Indices::numEq, throughput); const EvalWell throughput_eval(this->numWellEq_ + Indices::numEq, throughput);
EvalWell molecular_weight(this->numWellEq_ + Indices::numEq, 0.); EvalWell molecular_weight(this->numWellEq_ + Indices::numEq, 0.);