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 bore_diameters_

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 001d69c17b
commit ad39dbdaf0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,7 +263,6 @@ namespace Opm
protected: protected:
// protected member variables from the Base class // protected member variables from the Base class
using Base::bore_diameters_;
using Base::ipr_a_; using Base::ipr_a_;
using Base::ipr_b_; using Base::ipr_b_;

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

@ -1999,7 +1999,7 @@ namespace Opm
if (PolymerModule::hasShrate()) { if (PolymerModule::hasShrate()) {
// the equation for the water velocity conversion for the wells and reservoir are from different version // the equation for the water velocity conversion for the wells and reservoir are from different version
// of implementation. It can be changed to be more consistent when possible. // of implementation. It can be changed to be more consistent when possible.
water_velocity *= PolymerModule::shrate( int_quant.pvtRegionIndex() ) / bore_diameters_[perf]; water_velocity *= PolymerModule::shrate( int_quant.pvtRegionIndex() ) / this->bore_diameters_[perf];
} }
const EvalWell shear_factor = PolymerModule::computeShearFactor(polymer_concentration, const EvalWell shear_factor = PolymerModule::computeShearFactor(polymer_concentration,
int_quant.pvtRegionIndex(), int_quant.pvtRegionIndex(),
@ -2168,7 +2168,7 @@ namespace Opm
const auto& int_quants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); const auto& int_quants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));
const auto& fs = int_quants.fluidState(); const auto& fs = int_quants.fluidState();
const EvalWell b_w = this->extendEval(fs.invB(FluidSystem::waterPhaseIdx)); const EvalWell b_w = this->extendEval(fs.invB(FluidSystem::waterPhaseIdx));
const double area = M_PI * bore_diameters_[perf] * this->perf_length_[perf]; const double area = M_PI * this->bore_diameters_[perf] * this->perf_length_[perf];
const int wat_vel_index = Bhp + 1 + perf; const int wat_vel_index = Bhp + 1 + perf;
const unsigned water_comp_idx = Indices::canonicalToActiveComponentIndex(FluidSystem::waterCompIdx); const unsigned water_comp_idx = Indices::canonicalToActiveComponentIndex(FluidSystem::waterCompIdx);
@ -2194,7 +2194,7 @@ namespace Opm
const auto& fs = int_quants.fluidState(); const auto& fs = int_quants.fluidState();
const EvalWell b_w = this->extendEval(fs.invB(FluidSystem::waterPhaseIdx)); const EvalWell b_w = this->extendEval(fs.invB(FluidSystem::waterPhaseIdx));
const EvalWell water_flux_r = water_flux_s / b_w; const EvalWell water_flux_r = water_flux_s / b_w;
const double area = M_PI * bore_diameters_[perf] * this->perf_length_[perf]; const double area = M_PI * this->bore_diameters_[perf] * this->perf_length_[perf];
const EvalWell water_velocity = water_flux_r / area; const EvalWell water_velocity = water_flux_r / area;
const int wat_vel_index = Bhp + 1 + perf; const int wat_vel_index = Bhp + 1 + perf;