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 gravity_

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 5c3e13abd5
commit 78a4aa3ede
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,7 +180,6 @@ namespace Opm
// multi-phase flow model // multi-phase flow model
WellSegments::MultiPhaseModel multiphaseModel() const; WellSegments::MultiPhaseModel multiphaseModel() const;
using Base::gravity_;
using Base::perf_depth_; using Base::perf_depth_;
using Base::num_components_; using Base::num_components_;
using Base::connectionRates_; using Base::connectionRates_;

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

@@ -503,7 +503,7 @@ namespace Opm
} }
average_density /= sum_kr; average_density /= sum_kr;
this->cell_perforation_pressure_diffs_[perf] = gravity_ * average_density * this->cell_perforation_depth_diffs_[perf]; this->cell_perforation_pressure_diffs_[perf] = this->gravity_ * average_density * this->cell_perforation_depth_diffs_[perf];
} }
} }
@@ -912,7 +912,7 @@ namespace Opm
for (int seg = 0; seg < nseg; ++seg) { for (int seg = 0; seg < nseg; ++seg) {
// calculating the perforation rate for each perforation that belongs to this segment // calculating the perforation rate for each perforation that belongs to this segment
const double segment_depth = this->segmentSet()[seg].depth(); const double segment_depth = this->segmentSet()[seg].depth();
const double dp = wellhelpers::computeHydrostaticCorrection(ref_depth, segment_depth, this->segment_densities_[seg].value(), gravity_); const double dp = wellhelpers::computeHydrostaticCorrection(ref_depth, segment_depth, this->segment_densities_[seg].value(), this->gravity_);
ref_depth = segment_depth; ref_depth = segment_depth;
seg_bhp_press_diff += dp; seg_bhp_press_diff += dp;
for (const int perf : this->segment_perforations_[seg]) { for (const int perf : this->segment_perforations_[seg]) {
@@ -927,7 +927,7 @@ namespace Opm
const auto& fs = int_quantities.fluidState(); const auto& fs = int_quantities.fluidState();
// the pressure of the reservoir grid block the well connection is in // the pressure of the reservoir grid block the well connection is in
// pressure difference between the segment and the perforation // pressure difference between the segment and the perforation
const double perf_seg_press_diff = gravity_ * this->segment_densities_[seg].value() * this->perforation_segment_depth_diffs_[perf]; const double perf_seg_press_diff = this->gravity_ * this->segment_densities_[seg].value() * this->perforation_segment_depth_diffs_[perf];
// pressure difference between the perforation and the grid cell // pressure difference between the perforation and the grid cell
const double cell_perf_press_diff = this->cell_perforation_pressure_diffs_[perf]; const double cell_perf_press_diff = this->cell_perforation_pressure_diffs_[perf];
const double pressure_cell = fs.pressure(FluidSystem::oilPhaseIdx).value(); const double pressure_cell = fs.pressure(FluidSystem::oilPhaseIdx).value();
@@ -1369,7 +1369,7 @@ namespace Opm
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
// pressure difference between the segment and the perforation // pressure difference between the segment and the perforation
const EvalWell perf_seg_press_diff = gravity_ * this->segment_densities_[seg] * this->perforation_segment_depth_diffs_[perf]; const EvalWell perf_seg_press_diff = this->gravity_ * this->segment_densities_[seg] * this->perforation_segment_depth_diffs_[perf];
// pressure difference between the perforation and the grid cell // pressure difference between the perforation and the grid cell
const double cell_perf_press_diff = this->cell_perforation_pressure_diffs_[perf]; const double cell_perf_press_diff = this->cell_perforation_pressure_diffs_[perf];