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

rename StandardWellConnections::getRho() to just rho()

Browse Source
This commit is contained in:
Arne Morten Kvarving
2022-11-21 15:35:53 +01:00
parent 9aeb48887c
commit 1d058a4edf
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,8 @@ public:
std::vector<Scalar>& rvwmax_perf, std::vector<Scalar>& rvwmax_perf,
std::vector<Scalar>& surf_dens_perf) const; std::vector<Scalar>& surf_dens_perf) const;
Scalar getRho() const //! \brief Returns density for first perforation.
Scalar rho() const
{ {
return this->perf_densities_.empty() ? 0.0 : perf_densities_[0]; return this->perf_densities_.empty() ? 0.0 : perf_densities_[0];
} }

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

@@ -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(connections_.getRho(), updateThp(connections_.rho(),
[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),

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

@@ -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->connections_.getRho(), this->connections_.rho(),
this->linSys_, this->linSys_,
deferred_logger); deferred_logger);
@@ -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->connections_.getRho(), this->connections_.rho(),
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);
@@ -1918,7 +1918,7 @@ namespace Opm
StandardWell<TypeTag>:: StandardWell<TypeTag>::
getRefDensity() const getRefDensity() const
{ {
return this->connections_.getRho(); return this->connections_.rho();
} }
@@ -2316,7 +2316,7 @@ namespace Opm
auto bhpAtLimit = WellBhpThpCalculator(*this).computeBhpAtThpLimitProd(frates, auto bhpAtLimit = WellBhpThpCalculator(*this).computeBhpAtThpLimitProd(frates,
summary_state, summary_state,
max_pressure, max_pressure,
this->connections_.getRho(), this->connections_.rho(),
alq_value, alq_value,
deferred_logger); deferred_logger);
auto v = frates(*bhpAtLimit); auto v = frates(*bhpAtLimit);
@@ -2336,7 +2336,7 @@ namespace Opm
bhpAtLimit = WellBhpThpCalculator(*this).computeBhpAtThpLimitProd(fratesIter, bhpAtLimit = WellBhpThpCalculator(*this).computeBhpAtThpLimitProd(fratesIter,
summary_state, summary_state,
max_pressure, max_pressure,
this->connections_.getRho(), this->connections_.rho(),
alq_value, alq_value,
deferred_logger); deferred_logger);
v = frates(*bhpAtLimit); v = frates(*bhpAtLimit);
@@ -2370,7 +2370,7 @@ namespace Opm
return WellBhpThpCalculator(*this).computeBhpAtThpLimitInj(frates, return WellBhpThpCalculator(*this).computeBhpAtThpLimitInj(frates,
summary_state, summary_state,
this->connections_.getRho(), this->connections_.rho(),
1e-6, 1e-6,
50, 50,
true, true,