OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-15 22:51:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'adaptation_split_addWellEq' into Adding_PLYSHLOG_RELATED

Browse Source 
Conflicts:
	opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
This commit is contained in:
Kai Bao 2015-06-22 12:59:19 +02:00
commit 9cd52ca631
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
View File

@ -227,9 +227,10 @@ 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 ,
const V& transi,

9
opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp
View File

@ -337,11 +337,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_) {