Make multi-segment model use Base::addWellContribution...() method.

Also make assemble() more similar to base version, using the
extractWellPerfProperties() member from Base.

To do this it was necessary to change the well_cells member of the
WellOps to be correct for the multi-segment wells (since they may
have different perforation order for some wells).
This commit is contained in:
Atgeirr Flø Rasmussen
2015-10-13 11:28:48 +02:00
committed by Kai Bao
parent 44f36c45cf
commit 4dd8536afa
3 changed files with 24 additions and 76 deletions

View File

@@ -131,6 +131,7 @@ namespace Opm {
// For the non-segmented well, it should be the density with AVG or SEG way.
// while usually SEG way
using Base::wops_; // Only for well_cells, the w2p and p2w members may have wrong perf order.
using Base::well_perforation_densities_; //Density of each well perforation
using Base::pvdt_;
using Base::geo_;
@@ -247,11 +248,6 @@ namespace Opm {
addWellFluxEq(const std::vector<ADB>& cq_s,
const SolutionState& state);
void
addWellContributionToMassBalanceEq(const std::vector<ADB>& cq_s,
const SolutionState& state,
const WellState& xw);
void
addWellControlEq(const SolutionState& state,
const WellState& xw,