OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-20 11:48:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move mass balance equations to separate function.

Browse Source 
Note that well contributions are added on later in addWellEq() as before.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-05-26 00:31:50 +02:00
parent c2f4397bcf
commit 85436c4890
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/autodiff/BlackoilModelBase.hpp
View File

@ -282,6 +282,9 @@ namespace Opm {
void computeWellConnectionPressures(const SolutionState& state,
const WellState& xw);
void
assembleMassBalanceEq(const SolutionState& state);
void
addWellControlEq(const SolutionState& state,
const WellState& xw,

23
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -691,7 +691,23 @@ namespace detail {
// OPM_AD_DISKVAL(state.bhp);
// -------- Mass balance equations --------
assembleMassBalanceEq(state);
// -------- Well equations ----------
V aliveWells;
addWellEq(state, well_state, aliveWells);
addWellControlEq(state, well_state, aliveWells);
}
template <class Grid, class Implementation>
void
BlackoilModelBase<Grid, Implementation>::
assembleMassBalanceEq(const SolutionState& state)
{
// Compute b_p and the accumulation term b_p*s_p for each phase,
// except gas. For gas, we compute b_g*s_g + Rs*b_o*s_o.
// These quantities are stored in rq_[phase].accum[1].
@ -735,13 +751,6 @@ namespace detail {
// OPM_AD_DUMP(residual_.material_balance_eq[ Gas ]);
}
// -------- Well equations ----------
// Add contribution from wells and set up the well equations.
V aliveWells;
addWellEq(state, well_state, aliveWells);
addWellControlEq(state, well_state, aliveWells);
}