make member variables private in StandardWellConnections

This commit is contained in:
Arne Morten Kvarving
2022-11-21 15:21:24 +01:00
parent 1d058a4edf
commit dcc333dac3
3 changed files with 12 additions and 11 deletions

View File

@@ -43,9 +43,9 @@ namespace Opm
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices, class Scalar>
StandardWellConnections<FluidSystem,Indices,Scalar>:: StandardWellConnections<FluidSystem,Indices,Scalar>::
StandardWellConnections(const WellInterfaceGeneric& well) StandardWellConnections(const WellInterfaceGeneric& well)
: perf_densities_(well.numPerfs()) : well_(well)
, perf_densities_(well.numPerfs())
, perf_pressure_diffs_(well.numPerfs()) , perf_pressure_diffs_(well.numPerfs())
, well_(well)
{ {
} }

View File

@@ -68,14 +68,15 @@ public:
return this->perf_densities_.empty() ? 0.0 : perf_densities_[0]; return this->perf_densities_.empty() ? 0.0 : perf_densities_[0];
} }
// densities of the fluid in each perforation //! \brief Returns pressure drop for a given perforation.
std::vector<Scalar> perf_densities_; Scalar pressure_diff(const unsigned perf) const
// pressure drop between different perforations { return perf_pressure_diffs_[perf]; }
std::vector<Scalar> perf_pressure_diffs_;
private: private:
// Base interface reference const WellInterfaceGeneric& well_; //!< Base interface reference
const WellInterfaceGeneric& well_;
std::vector<Scalar> perf_densities_; //!< densities of the fluid in each perforation
std::vector<Scalar> perf_pressure_diffs_; //!< // pressure drop between different perforations
}; };
} }

View File

@@ -777,7 +777,7 @@ namespace Opm
} }
// Store the perforation pressure for later usage. // Store the perforation pressure for later usage.
perf_data.pressure[perf] = ws.bhp + this->connections_.perf_pressure_diffs_[perf]; perf_data.pressure[perf] = ws.bhp + this->connections_.pressure_diff(perf);
} }
@@ -1021,7 +1021,7 @@ namespace Opm
} }
// the pressure difference between the connection and BHP // the pressure difference between the connection and BHP
const double h_perf = this->connections_.perf_pressure_diffs_[perf]; const double h_perf = this->connections_.pressure_diff(perf);
const double pressure_diff = p_r - h_perf; const double pressure_diff = p_r - h_perf;
// Let us add a check, since the pressure is calculated based on zero value BHP // Let us add a check, since the pressure is calculated based on zero value BHP
@@ -1204,7 +1204,7 @@ namespace Opm
const double bhp = this->primary_variables_.eval(Bhp).value(); const double bhp = this->primary_variables_.eval(Bhp).value();
// Pressure drawdown (also used to determine direction of flow) // Pressure drawdown (also used to determine direction of flow)
const double well_pressure = bhp + this->connections_.perf_pressure_diffs_[perf]; const double well_pressure = bhp + this->connections_.pressure_diff(perf);
const double drawdown = pressure - well_pressure; const double drawdown = pressure - well_pressure;
// for now, if there is one perforation can produce/inject in the correct // for now, if there is one perforation can produce/inject in the correct