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

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
parent 04a72bd325 78775cd33e
commit 9cd52ca631
2 changed files with 9 additions and 7 deletions
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,