From 78775cd33e2abc8471cd813e96b26847b7ae781a Mon Sep 17 00:00:00 2001 From: Kai Bao Date: Mon, 22 Jun 2015 12:48:22 +0200 Subject: [PATCH] parameter order change of addWellContributionToMassBalanceEq(). To follow the corresponding change in opm-autodiff. --- opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp | 6 +++--- opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp b/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp index 09fbb214c..79507c843 100644 --- a/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp +++ b/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp @@ -207,9 +207,9 @@ namespace Opm { assembleMassBalanceEq(const SolutionState& state); void - addWellContributionToMassBalanceEq(const SolutionState& state, - const WellState& xw, - const std::vector& cq_s); + addWellContributionToMassBalanceEq(const std::vector& cq_s, + const SolutionState& state, + WellState& xw); void computeMassFlux(const int actph , diff --git a/opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp b/opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp index f3d8e2c0c..dbcaf149b 100644 --- a/opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp +++ b/opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp @@ -279,11 +279,12 @@ namespace Opm { template - void BlackoilPolymerModel::addWellContributionToMassBalanceEq(const SolutionState& state, - const WellState& xw, - const std::vector& cq_s) + void BlackoilPolymerModel::addWellContributionToMassBalanceEq(const std::vector& 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_) {