Merge pull request #131 from GitPaean/adaptation_split_addWellEq

change the parameter order addWellContributionToMassBalanceEq().
This commit is contained in:
Atgeirr Flø Rasmussen 2015-06-23 11:38:13 +02:00
commit 9128ef23f1
2 changed files with 8 additions and 7 deletions

View File

@ -207,9 +207,9 @@ namespace Opm {
assembleMassBalanceEq(const SolutionState& state);
void
addWellContributionToMassBalanceEq(const SolutionState& state,
const WellState& xw,
const std::vector<ADB>& cq_s);
addWellContributionToMassBalanceEq(const std::vector<ADB>& cq_s,
const SolutionState& state,
WellState& xw);
void
computeMassFlux(const int actph ,

View File

@ -279,11 +279,12 @@ namespace Opm {
template <class Grid>
void BlackoilPolymerModel<Grid>::addWellContributionToMassBalanceEq(const SolutionState& state,
const WellState& xw,
const std::vector<ADB>& cq_s)
void BlackoilPolymerModel<Grid>::addWellContributionToMassBalanceEq(const std::vector<ADB>& cq_s,
const SolutionState& state,
WellState& xw)
{
Base::addWellContributionToMassBalanceEq(state, xw, cq_s);
Base::addWellContributionToMassBalanceEq(cq_s, state, xw);
// Add well contributions to polymer mass balance equation
if (has_polymer_) {