OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-08-26 10:47:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

drop using statement for well_cells_

Browse Source 
rather qualify member variable with this->
This commit is contained in:
Arne Morten Kvarving
2021-09-09 11:53:34 +02:00
parent d10fa061c3
commit 6f4f41f080
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/simulators/wells/MultisegmentWell.hpp
-3
View File
@@ -180,9 +180,6 @@ namespace Opm
// multi-phase flow model // multi-phase flow model
WellSegments::MultiPhaseModel multiphaseModel() const; WellSegments::MultiPhaseModel multiphaseModel() const;
// TODO: the current implementation really relies on the order of the
// perforation does not change from the parser to Wells structure.
using Base::well_cells_;
using Base::param_; using Base::param_;
using Base::well_index_; using Base::well_index_;
using Base::saturation_table_number_; using Base::saturation_table_number_;
opm/simulators/wells/MultisegmentWell_impl.hpp
+10 -10
View File
@@ -102,7 +102,7 @@ namespace Opm
// calcuate the depth difference between the perforations and the perforated grid block // calcuate the depth difference between the perforations and the perforated grid block
for (int perf = 0; perf < this->number_of_perforations_; ++perf) { for (int perf = 0; perf < this->number_of_perforations_; ++perf) {
const int cell_idx = well_cells_[perf]; const int cell_idx = this->well_cells_[perf];
this->cell_perforation_depth_diffs_[perf] = depth_arg[cell_idx] - perf_depth_[perf]; this->cell_perforation_depth_diffs_[perf] = depth_arg[cell_idx] - perf_depth_[perf];
} }
} }
@@ -466,7 +466,7 @@ namespace Opm
std::vector<double> kr(this->number_of_phases_, 0.0); std::vector<double> kr(this->number_of_phases_, 0.0);
std::vector<double> density(this->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 = this->well_cells_[perf];
const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
@@ -757,7 +757,7 @@ namespace Opm
int pvt_region_index; int pvt_region_index;
{ {
// using the first perforated cell // using the first perforated cell
const int cell_idx = well_cells_[0]; const int cell_idx = this->well_cells_[0];
const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/0)); const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/0));
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
temperature.setValue(fs.temperature(FluidSystem::oilPhaseIdx).value()); temperature.setValue(fs.temperature(FluidSystem::oilPhaseIdx).value());
@@ -782,7 +782,7 @@ namespace Opm
std::vector<EvalWell>& mob) const std::vector<EvalWell>& mob) const
{ {
// TODO: most of this function, if not the whole function, can be moved to the base class // TODO: most of this function, if not the whole function, can be moved to the base class
const int cell_idx = well_cells_[perf]; const int cell_idx = this->well_cells_[perf];
assert (int(mob.size()) == num_components_); assert (int(mob.size()) == num_components_);
const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/0)); const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/0));
const auto& materialLawManager = ebosSimulator.problem().materialLawManager(); const auto& materialLawManager = ebosSimulator.problem().materialLawManager();
@@ -922,7 +922,7 @@ namespace Opm
// TODO: mabye we should store the mobility somewhere, so that we only need to calculate it one per iteration // TODO: mabye we should store the mobility somewhere, so that we only need to calculate it one per iteration
getMobility(ebos_simulator, perf, mob); getMobility(ebos_simulator, perf, mob);
const int cell_idx = well_cells_[perf]; const int cell_idx = this->well_cells_[perf];
const auto& int_quantities = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); const auto& int_quantities = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));
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
@@ -1271,7 +1271,7 @@ namespace Opm
auto& perf_rates = perf_data.phase_rates; auto& perf_rates = perf_data.phase_rates;
auto& perf_press_state = perf_data.pressure; auto& perf_press_state = perf_data.pressure;
for (const int perf : this->segment_perforations_[seg]) { for (const int perf : this->segment_perforations_[seg]) {
const int cell_idx = well_cells_[perf]; const int cell_idx = this->well_cells_[perf];
const auto& int_quants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); const auto& int_quants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));
std::vector<EvalWell> mob(num_components_, 0.0); std::vector<EvalWell> mob(num_components_, 0.0);
getMobility(ebosSimulator, perf, mob); getMobility(ebosSimulator, perf, mob);
@@ -1364,7 +1364,7 @@ namespace Opm
const EvalWell segment_pressure = this->getSegmentPressure(seg); const EvalWell segment_pressure = this->getSegmentPressure(seg);
for (const int perf : this->segment_perforations_[seg]) { for (const int perf : this->segment_perforations_[seg]) {
const int cell_idx = well_cells_[perf]; const int cell_idx = this->well_cells_[perf];
const auto& intQuants = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); const auto& intQuants = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
@@ -1418,7 +1418,7 @@ namespace Opm
{ {
// using the pvt region of first perforated cell // using the pvt region of first perforated cell
// TODO: it should be a member of the WellInterface, initialized properly // TODO: it should be a member of the WellInterface, initialized properly
const int cell_idx = well_cells_[0]; const int cell_idx = this->well_cells_[0];
const auto& intQuants = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/0)); const auto& intQuants = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/0));
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
temperature.setValue(fs.temperature(FluidSystem::oilPhaseIdx).value()); temperature.setValue(fs.temperature(FluidSystem::oilPhaseIdx).value());
@@ -1502,7 +1502,7 @@ namespace Opm
const int nseg = this->numberOfSegments(); const int nseg = this->numberOfSegments();
for (int seg = 0; seg < nseg; ++seg) { for (int seg = 0; seg < nseg; ++seg) {
for (const int perf : this->segment_perforations_[seg]) { for (const int perf : this->segment_perforations_[seg]) {
const int cell_idx = well_cells_[perf]; const int cell_idx = this->well_cells_[perf];
const auto& int_quants = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); const auto& int_quants = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));
const auto& fs = int_quants.fluidState(); const auto& fs = int_quants.fluidState();
double pressure_cell = fs.pressure(FluidSystem::oilPhaseIdx).value(); double pressure_cell = fs.pressure(FluidSystem::oilPhaseIdx).value();
@@ -1530,7 +1530,7 @@ namespace Opm
// 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 EvalWell seg_pressure = this->getSegmentPressure(seg); const EvalWell seg_pressure = this->getSegmentPressure(seg);
for (const int perf : this->segment_perforations_[seg]) { for (const int perf : this->segment_perforations_[seg]) {
const int cell_idx = well_cells_[perf]; const int cell_idx = this->well_cells_[perf];
const auto& int_quants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); const auto& int_quants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));
std::vector<EvalWell> mob(num_components_, 0.0); std::vector<EvalWell> mob(num_components_, 0.0);
getMobility(ebosSimulator, perf, mob); getMobility(ebosSimulator, perf, mob);