OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-26 19:56:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

StandardWellPrimaryVariables: make data members private

Browse Source 
and add generic read-only accessors
This commit is contained in:
Arne Morten Kvarving 2022-11-09 12:26:46 +01:00
parent 4bbcdf0646
commit f64628f72d
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,8 @@ namespace Opm
// TODO: we should have indices for the well equations and well primary variables separately
static constexpr int Bhp = numStaticWellEq - numWellControlEq;
using StdWellEval::WQTotal;
using typename Base::Scalar;

32
opm/simulators/wells/StandardWellPrimaryVariables.hpp
View File

@ -69,7 +69,7 @@ public:
//! \details Based on the solution strategy, there might be other well equations be introduced.
static constexpr int numStaticWellEq = numWellConservationEq + numWellControlEq;
static const int WQTotal = 0; //!< The index for the weights total rate
static constexpr int WQTotal = 0; //!< The index for the weighted total rate
//! \brief The index for Bhp in primary variables and the index of well control equation.
//! \details They both will be the last one in their respective system.
@ -91,14 +91,6 @@ public:
: well_(well)
{}
//! \brief The values for the primary variables.
//! \details Based on different solution strategies, the wells can have different primary variables.
std::vector<double> value_;
//! \brief The Evaluation for the well primary variables.
//! \details Contain derivatives and are used in AD calculation
std::vector<EvalWell> evaluation_;
//! \brief Initialize evaluations from values.
void init();
@ -140,15 +132,13 @@ public:
//! \brief Returns scaled rate for a component.
EvalWell getQs(const int compIdx) const;
const EvalWell& getBhp() const
{
return evaluation_[Bhp];
}
//! \brief Returns a const ref to an evaluation.
Scalar value(const int idx) const
{ return value_[idx]; }
const EvalWell& getWQTotal() const
{
return evaluation_[WQTotal];
}
//! \brief Returns a const ref to an evaluation.
const EvalWell& eval(const int idx) const
{ return evaluation_[idx]; }
private:
//! \brief Calculate a relaxation factor for producers.
@ -161,6 +151,14 @@ private:
//! \brief Handle non-reasonable fractions due to numerical overshoot.
void processFractions();
//! \brief The values for the primary variables.
//! \details Based on different solution strategies, the wells can have different primary variables.
std::vector<double> value_;
//! \brief The Evaluation for the well primary variables.
//! \details Contain derivatives and are used in AD calculation
std::vector<EvalWell> evaluation_;
const WellInterfaceIndices<FluidSystem,Indices,Scalar>& well_; //!< Reference to well interface
//! \brief Total number of the well equations and primary variables.

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

@ -129,7 +129,7 @@ namespace Opm
if (has_polymermw) {
if (this->isInjector()) {
const int pskin_index = Bhp + 1 + this->numPerfs() + perf;
skin_pressure = this->primary_variables_.evaluation_[pskin_index];
skin_pressure = this->primary_variables_.eval(pskin_index);
}
}
@ -199,7 +199,7 @@ namespace Opm
if (has_polymermw) {
if (this->isInjector()) {
const int pskin_index = Bhp + 1 + this->numPerfs() + perf;
skin_pressure = getValue(this->primary_variables_.evaluation_[pskin_index]);
skin_pressure = getValue(this->primary_variables_.eval(pskin_index));
}
}
@ -547,8 +547,8 @@ namespace Opm
assembleControlEq(well_state, group_state,
schedule, summaryState,
this->primary_variables_.numWellEq(),
this->primary_variables_.getWQTotal(),
this->primary_variables_.getBhp(),
this->primary_variables_.eval(WQTotal),
this->primary_variables_.eval(Bhp),
gQ,
this->getRho(),
Bhp,
@ -580,7 +580,7 @@ namespace Opm
DeferredLogger& deferred_logger) const
{
const bool allow_cf = this->getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebosSimulator);
const EvalWell& bhp = this->primary_variables_.getBhp();
const EvalWell& bhp = this->primary_variables_.eval(Bhp);
const int cell_idx = this->well_cells_[perf];
const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));
std::vector<EvalWell> mob(this->num_components_, {this->primary_variables_.numWellEq() + Indices::numEq, 0.});
@ -1215,7 +1215,7 @@ namespace Opm
const auto& fs = intQuants.fluidState();
const double pressure = this->getPerfCellPressure(fs).value();
const double bhp = this->primary_variables_.getBhp().value();
const double bhp = this->primary_variables_.eval(Bhp).value();
// Pressure drawdown (also used to determine direction of flow)
const double well_pressure = bhp + this->perf_pressure_diffs_[perf];
@ -2082,7 +2082,7 @@ namespace Opm
// compute the well water velocity with out shear effects.
// TODO: do we need to turn on crossflow here?
const bool allow_cf = this->getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebos_simulator);
const EvalWell& bhp = this->primary_variables_.getBhp();
const EvalWell& bhp = this->primary_variables_.eval(Bhp);
std::vector<EvalWell> cq_s(this->num_components_, {this->primary_variables_.numWellEq() + Indices::numEq, 0.});
double perf_dis_gas_rate = 0.;
@ -2251,7 +2251,7 @@ namespace Opm
auto& ws = well_state.well(this->index_of_well_);
auto& perf_water_throughput = ws.perf_data.water_throughput;
for (int perf = 0; perf < this->number_of_perforations_; ++perf) {
const double perf_water_vel = this->primary_variables_.value_[Bhp + 1 + perf];
const double perf_water_vel = this->primary_variables_.value(Bhp + 1 + perf);
// we do not consider the formation damage due to water flowing from reservoir into wellbore
if (perf_water_vel > 0.) {
perf_water_throughput[perf] += perf_water_vel * dt;
@ -2282,7 +2282,7 @@ namespace Opm
// water rate is update to use the form from water velocity, since water velocity is
// a primary variable now
cq_s[water_comp_idx] = area * this->primary_variables_.evaluation_[wat_vel_index] * b_w;
cq_s[water_comp_idx] = area * this->primary_variables_.eval(wat_vel_index) * b_w;
}
@ -2307,7 +2307,7 @@ namespace Opm
const int wat_vel_index = Bhp + 1 + perf;
// equation for the water velocity
const EvalWell eq_wat_vel = this->primary_variables_.evaluation_[wat_vel_index] - water_velocity;
const EvalWell eq_wat_vel = this->primary_variables_.eval(wat_vel_index) - water_velocity;
const auto& ws = well_state.well(this->index_of_well_);
const auto& perf_data = ws.perf_data;
@ -2319,8 +2319,8 @@ namespace Opm
poly_conc.setValue(this->wpolymer());
// equation for the skin pressure
const EvalWell eq_pskin = this->primary_variables_.evaluation_[pskin_index]
- pskin(throughput, this->primary_variables_.evaluation_[wat_vel_index], poly_conc, deferred_logger);
const EvalWell eq_pskin = this->primary_variables_.eval(pskin_index)
- pskin(throughput, this->primary_variables_.eval(wat_vel_index), poly_conc, deferred_logger);
StandardWellAssemble<FluidSystem,Indices,Scalar>(*this).
assembleInjectivityEq(eq_pskin,
@ -2369,7 +2369,7 @@ namespace Opm
EvalWell cq_s_polymw = cq_s_poly;
if (this->isInjector()) {
const int wat_vel_index = Bhp + 1 + perf;
const EvalWell water_velocity = this->primary_variables_.evaluation_[wat_vel_index];
const EvalWell water_velocity = this->primary_variables_.eval(wat_vel_index);
if (water_velocity > 0.) { // injecting
const auto& ws = well_state.well(this->index_of_well_);
const auto& perf_water_throughput = ws.perf_data.water_throughput;
@ -2563,7 +2563,7 @@ namespace Opm
{
// Calculate the rates that follow from the current primary variables.
std::vector<double> well_q_s(this->num_components_, 0.);
const EvalWell& bhp = this->primary_variables_.getBhp();
const EvalWell& bhp = this->primary_variables_.eval(Bhp);
const bool allow_cf = this->getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebosSimulator);
for (int perf = 0; perf < this->number_of_perforations_; ++perf) {
const int cell_idx = this->well_cells_[perf];