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
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>
StandardWellEval<FluidSystem,Indices,Scalar>::
StandardWellEval(const WellInterfaceIndices<FluidSystem,Indices,Scalar>& baseif)
: StandardWellConnections<Scalar>(baseif)
, baseif_(baseif)
: baseif_(baseif)
, primary_variables_(baseif_)
, F0_(numWellConservationEq)
, linSys_(baseif_.parallelWellInfo())
, connections_(baseif)
{
}
@@ -78,7 +78,7 @@ updateWellStateFromPrimaryVariables(WellState& well_state,
this->primary_variables_.copyToWellState(well_state, deferred_logger);
WellBhpThpCalculator(baseif_).
updateThp(this->getRho(),
updateThp(connections_.getRho(),
[this,&well_state]() { return this->baseif_.getALQ(well_state); },
{FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx),
FluidSystem::phaseIsActive(FluidSystem::oilPhaseIdx),
@@ -343,7 +343,7 @@ computeConnectionDensities(const std::vector<double>& perfComponentRates,
}
// 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;
}
}