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

drop using statement for number_of_phases_

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 72b14cf07e
commit d10fa061c3
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,9 +180,6 @@ namespace Opm
// multi-phase flow model // multi-phase flow model
WellSegments::MultiPhaseModel multiphaseModel() const; WellSegments::MultiPhaseModel multiphaseModel() const;
// protected member variables from the Base class
using Base::number_of_phases_;
// TODO: the current implementation really relies on the order of the // TODO: the current implementation really relies on the order of the
// perforation does not change from the parser to Wells structure. // perforation does not change from the parser to Wells structure.
using Base::well_cells_; using Base::well_cells_;

20
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@@ -246,7 +246,7 @@ namespace Opm
std::vector<double>& well_potentials, std::vector<double>& well_potentials,
DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
const int np = number_of_phases_; const int np = this->number_of_phases_;
well_potentials.resize(np, 0.0); well_potentials.resize(np, 0.0);
// Stopped wells have zero potential. // Stopped wells have zero potential.
@@ -364,7 +364,7 @@ namespace Opm
well_copy.scaleSegmentPressuresWithBhp(well_state_copy); well_copy.scaleSegmentPressuresWithBhp(well_state_copy);
// 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 = this->number_of_phases_;
const double sign = well_copy.well_ecl_.isInjector() ? 1.0 : -1.0; const double sign = well_copy.well_ecl_.isInjector() ? 1.0 : -1.0;
for (int phase = 0; phase < np; ++phase){ for (int phase = 0; phase < np; ++phase){
ws.surface_rates[phase] = sign * ws.well_potentials[phase]; ws.surface_rates[phase] = sign * ws.well_potentials[phase];
@@ -395,7 +395,7 @@ namespace Opm
computeWellPotentialWithTHP(const Simulator& ebos_simulator, computeWellPotentialWithTHP(const Simulator& ebos_simulator,
DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
std::vector<double> potentials(number_of_phases_, 0.0); std::vector<double> potentials(this->number_of_phases_, 0.0);
const auto& summary_state = ebos_simulator.vanguard().summaryState(); const auto& summary_state = ebos_simulator.vanguard().summaryState();
const auto& well = this->well_ecl_; const auto& well = this->well_ecl_;
@@ -463,8 +463,8 @@ namespace Opm
{ {
for (int perf = 0; perf < this->number_of_perforations_; ++perf) { for (int perf = 0; perf < this->number_of_perforations_; ++perf) {
std::vector<double> kr(number_of_phases_, 0.0); std::vector<double> kr(this->number_of_phases_, 0.0);
std::vector<double> density(number_of_phases_, 0.0); std::vector<double> density(this->number_of_phases_, 0.0);
const int cell_idx = well_cells_[perf]; const int cell_idx = well_cells_[perf];
const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));
@@ -498,7 +498,7 @@ namespace Opm
// calculate the average density // calculate the average density
double average_density = 0.; double average_density = 0.;
for (int p = 0; p < number_of_phases_; ++p) { for (int p = 0; p < this->number_of_phases_; ++p) {
average_density += kr[p] * density[p]; average_density += kr[p] * density[p];
} }
average_density /= sum_kr; average_density /= sum_kr;
@@ -851,7 +851,7 @@ namespace Opm
// we need to check the BHP limit // we need to check the BHP limit
double temp = 0; double temp = 0;
for (int p = 0; p < number_of_phases_; ++p) { for (int p = 0; p < this->number_of_phases_; ++p) {
temp += ipr_a_[p] - ipr_b_[p] * bhp_limit; temp += ipr_a_[p] - ipr_b_[p] * bhp_limit;
} }
if (temp < 0.) { if (temp < 0.) {
@@ -962,7 +962,7 @@ namespace Opm
// ipr values for the perforation // ipr values for the perforation
std::vector<double> ipr_a_perf(ipr_a_.size()); std::vector<double> ipr_a_perf(ipr_a_.size());
std::vector<double> ipr_b_perf(ipr_b_.size()); std::vector<double> ipr_b_perf(ipr_b_.size());
for (int p = 0; p < number_of_phases_; ++p) { for (int p = 0; p < this->number_of_phases_; ++p) {
const double tw_mob = tw_perf * mob[p].value() * b_perf[p]; const double tw_mob = tw_perf * mob[p].value() * b_perf[p];
ipr_a_perf[p] += tw_mob * pressure_diff; ipr_a_perf[p] += tw_mob * pressure_diff;
ipr_b_perf[p] += tw_mob; ipr_b_perf[p] += tw_mob;
@@ -988,7 +988,7 @@ namespace Opm
ipr_b_perf[oil_comp_idx] += vap_oil_b; ipr_b_perf[oil_comp_idx] += vap_oil_b;
} }
for (int p = 0; p < number_of_phases_; ++p) { for (int p = 0; p < this->number_of_phases_; ++p) {
// TODO: double check the indices here // TODO: double check the indices here
ipr_a_[ebosCompIdxToFlowCompIdx(p)] += ipr_a_perf[p]; ipr_a_[ebosCompIdxToFlowCompIdx(p)] += ipr_a_perf[p];
ipr_b_[ebosCompIdxToFlowCompIdx(p)] += ipr_b_perf[p]; ipr_b_[ebosCompIdxToFlowCompIdx(p)] += ipr_b_perf[p];
@@ -1291,7 +1291,7 @@ namespace Opm
// store the perf pressure and rates // store the perf pressure and rates
for (int comp_idx = 0; comp_idx < num_components_; ++comp_idx) { for (int comp_idx = 0; comp_idx < num_components_; ++comp_idx) {
perf_rates[perf*number_of_phases_ + ebosCompIdxToFlowCompIdx(comp_idx)] = cq_s[comp_idx].value(); perf_rates[perf*this->number_of_phases_ + ebosCompIdxToFlowCompIdx(comp_idx)] = cq_s[comp_idx].value();
} }
perf_press_state[perf] = perf_press.value(); perf_press_state[perf] = perf_press.value();