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

fixing the compilation error due to rebasing.

Browse Source
This commit is contained in:
Kai Bao 2016-05-23 15:42:05 +02:00
parent d2d9bd8a80
commit 0ebd25f66a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@ -378,6 +378,11 @@ namespace Opm {
}
}
template <class Grid>
void
BlackoilSolventModel<Grid>::
@ -410,7 +415,7 @@ namespace Opm {
varstart += dss.size();
// Extract well parts np phase rates + bhp
const V dwells = subset(dx, Span(Base::numWellVars(), 1, varstart));
const V dwells = subset(dx, Span(wellModel().numWellVars(), 1, varstart));
varstart += dwells.size();
assert(varstart == dx.size());
@ -616,10 +621,7 @@ namespace Opm {
std::copy(&rv[0], &rv[0] + nc, reservoir_state.rv().begin());
}
// TODO: gravity should be stored as a member
// const double gravity = detail::getGravity(geo_.gravity(), UgGridHelpers::dimensions(grid_));
// asImpl().stdWells().updateWellState(dwells, gravity, dpMaxRel(), fluid_.phaseUsage(), active_, vfp_properties_, well_state);
Base::updateWellState(dwells,well_state);
wellModel().updateWellState(dwells, dpMaxRel(), well_state);
// Update phase conditions used for property calculations.
updatePhaseCondFromPrimalVariable(reservoir_state);