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 'master' into Adding_PLYSHLOG_RELATED

Browse Source 
Conflicts:
	opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
This commit is contained in:
Kai Bao
2015-06-18 15:45:31 +02:00
parent 6745a2fb0a c45907a41f
commit f3c98bc95a
3 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,13 +232,9 @@ namespace Opm {
V& aliveWells);
void
extraAddWellEq(const SolutionState& state,
const WellState& xw,
const std::vector<ADB>& cq_ps,
const std::vector<ADB>& cmix_s,
const ADB& cqt_is,
const std::vector<int>& well_cells);
addWellContributionToMassBalanceEq(const SolutionState& state,
const WellState& xw,
const std::vector<ADB>& cq_s);
void
computeMassFlux(const int actph ,
const V& transi,