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

changed: move StandardWellConnections out of inheritance hierarchy

Browse Source 
instead hold a member in StandardWellEval
This commit is contained in:
Arne Morten Kvarving 2022-11-21 13:03:05 +01:00
parent b08c165384
commit 7cadeb5206
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/simulators/wells/StandardWellEval.cpp
View File

@ -49,11 +49,11 @@ namespace Opm
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices, class Scalar>
StandardWellEval<FluidSystem,Indices,Scalar>:: StandardWellEval<FluidSystem,Indices,Scalar>::
StandardWellEval(const WellInterfaceIndices<FluidSystem,Indices,Scalar>& baseif) StandardWellEval(const WellInterfaceIndices<FluidSystem,Indices,Scalar>& baseif)
: StandardWellConnections<Scalar>(baseif) : baseif_(baseif)
, baseif_(baseif)
, primary_variables_(baseif_) , primary_variables_(baseif_)
, F0_(numWellConservationEq) , F0_(numWellConservationEq)
, linSys_(baseif_.parallelWellInfo()) , linSys_(baseif_.parallelWellInfo())
, connections_(baseif)
{ {
} }
@ -78,7 +78,7 @@ updateWellStateFromPrimaryVariables(WellState& well_state,
this->primary_variables_.copyToWellState(well_state, deferred_logger); this->primary_variables_.copyToWellState(well_state, deferred_logger);
WellBhpThpCalculator(baseif_). WellBhpThpCalculator(baseif_).
updateThp(this->getRho(), updateThp(connections_.getRho(),
[this,&well_state]() { return this->baseif_.getALQ(well_state); }, [this,&well_state]() { return this->baseif_.getALQ(well_state); },
{FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx), {FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx),
FluidSystem::phaseIsActive(FluidSystem::oilPhaseIdx), FluidSystem::phaseIsActive(FluidSystem::oilPhaseIdx),
@ -343,7 +343,7 @@ computeConnectionDensities(const std::vector<double>& perfComponentRates,
} }
// Compute segment density. // Compute segment density.
this->perf_densities_[perf] = std::inner_product(surf_dens.begin(), surf_dens.end(), mix.begin(), 0.0) / volrat; this->connections_.perf_densities_[perf] = std::inner_product(surf_dens.begin(), surf_dens.end(), mix.begin(), 0.0) / volrat;
} }
} }

3
opm/simulators/wells/StandardWellEval.hpp
View File

@ -45,7 +45,7 @@ template<class FluidSystem, class Indices, class Scalar> class WellInterfaceIndi
class WellState; class WellState;
template<class FluidSystem, class Indices, class Scalar> template<class FluidSystem, class Indices, class Scalar>
class StandardWellEval : public StandardWellConnections<Scalar> class StandardWellEval
{ {
protected: protected:
using PrimaryVariables = StandardWellPrimaryVariables<FluidSystem,Indices,Scalar>; using PrimaryVariables = StandardWellPrimaryVariables<FluidSystem,Indices,Scalar>;
@ -111,6 +111,7 @@ protected:
std::vector<double> F0_; std::vector<double> F0_;
StandardWellEquations<Scalar,Indices::numEq> linSys_; //!< Linear equation system StandardWellEquations<Scalar,Indices::numEq> linSys_; //!< Linear equation system
StandardWellConnections<Scalar> connections_; //!< Connection level values
}; };
} }

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

@ -255,7 +255,7 @@ namespace Opm
DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
// Pressure drawdown (also used to determine direction of flow) // Pressure drawdown (also used to determine direction of flow)
const Value well_pressure = bhp + this->perf_pressure_diffs_[perf]; const Value well_pressure = bhp + this->connections_.perf_pressure_diffs_[perf];
Value drawdown = pressure - well_pressure; Value drawdown = pressure - well_pressure;
if (this->isInjector()) { if (this->isInjector()) {
drawdown += skin_pressure; drawdown += skin_pressure;
@ -546,7 +546,7 @@ namespace Opm
assembleControlEq(well_state, group_state, assembleControlEq(well_state, group_state,
schedule, summaryState, schedule, summaryState,
this->primary_variables_, this->primary_variables_,
this->getRho(), this->connections_.getRho(),
this->linSys_, this->linSys_,
deferred_logger); deferred_logger);
@ -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->perf_pressure_diffs_[perf]; perf_data.pressure[perf] = ws.bhp + this->connections_.perf_pressure_diffs_[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->perf_pressure_diffs_[perf]; const double h_perf = this->connections_.perf_pressure_diffs_[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
@ -1117,7 +1117,7 @@ namespace Opm
this->adaptRatesForVFP(well_rates_bhp_limit); this->adaptRatesForVFP(well_rates_bhp_limit);
const double thp = WellBhpThpCalculator(*this).calculateThpFromBhp(well_rates_bhp_limit, const double thp = WellBhpThpCalculator(*this).calculateThpFromBhp(well_rates_bhp_limit,
bhp_limit, bhp_limit,
this->getRho(), this->connections_.getRho(),
this->getALQ(well_state), this->getALQ(well_state),
deferred_logger); deferred_logger);
const double thp_limit = this->getTHPConstraint(summaryState); const double thp_limit = this->getTHPConstraint(summaryState);
@ -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->perf_pressure_diffs_[perf]; const double well_pressure = bhp + this->connections_.perf_pressure_diffs_[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
@ -1627,7 +1627,7 @@ namespace Opm
this->computeConnectionDensities(perfRates, b_perf, rsmax_perf, rvmax_perf, rvwmax_perf, surf_dens_perf, deferred_logger); this->computeConnectionDensities(perfRates, b_perf, rsmax_perf, rvmax_perf, rvwmax_perf, surf_dens_perf, deferred_logger);
this->computeConnectionPressureDelta(); this->connections_.computeConnectionPressureDelta();
} }
@ -2032,7 +2032,7 @@ namespace Opm
StandardWell<TypeTag>:: StandardWell<TypeTag>::
getRefDensity() const getRefDensity() const
{ {
return this->perf_densities_[0]; return this->connections_.getRho();
} }
@ -2430,7 +2430,7 @@ namespace Opm
auto bhpAtLimit = WellBhpThpCalculator(*this).computeBhpAtThpLimitProd(frates, auto bhpAtLimit = WellBhpThpCalculator(*this).computeBhpAtThpLimitProd(frates,
summary_state, summary_state,
max_pressure, max_pressure,
this->getRho(), this->connections_.getRho(),
alq_value, alq_value,
deferred_logger); deferred_logger);
auto v = frates(*bhpAtLimit); auto v = frates(*bhpAtLimit);
@ -2450,7 +2450,7 @@ namespace Opm
bhpAtLimit = WellBhpThpCalculator(*this).computeBhpAtThpLimitProd(fratesIter, bhpAtLimit = WellBhpThpCalculator(*this).computeBhpAtThpLimitProd(fratesIter,
summary_state, summary_state,
max_pressure, max_pressure,
this->getRho(), this->connections_.getRho(),
alq_value, alq_value,
deferred_logger); deferred_logger);
v = frates(*bhpAtLimit); v = frates(*bhpAtLimit);
@ -2484,7 +2484,7 @@ namespace Opm
return WellBhpThpCalculator(*this).computeBhpAtThpLimitInj(frates, return WellBhpThpCalculator(*this).computeBhpAtThpLimitInj(frates,
summary_state, summary_state,
this->getRho(), this->connections_.getRho(),
1e-6, 1e-6,
50, 50,
true, true,