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 pull request #400 from atgeirr/change-model-for-downstream-users

Browse Source 
Add more parameters to addWellContributionToMassBalanceEq.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-06-18 15:02:39 +02:00
commit 7d3ea6b38e
2 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/autodiff/BlackoilModelBase.hpp
View File

@ -307,9 +307,6 @@ namespace Opm {
std::vector<int> std::vector<int>
variableWellStateIndices() const; variableWellStateIndices() const;
void
addWellContributionToMassBalanceEq(const std::vector<ADB>& cq_s);
SolutionState SolutionState
variableStateExtractVars(const ReservoirState& x, variableStateExtractVars(const ReservoirState& x,
const std::vector<int>& indices, const std::vector<int>& indices,
@ -350,12 +347,9 @@ namespace Opm {
std::vector<ADB>& cq_s); std::vector<ADB>& cq_s);
void void
extraAddWellEq(const SolutionState& state, addWellContributionToMassBalanceEq(const SolutionState& state,
const WellState& xw, const WellState& xw,
const std::vector<ADB>& cq_ps, const std::vector<ADB>& cq_s);
const std::vector<ADB>& cmix_s,
const ADB& cqt_is,
const std::vector<int>& well_cells);
void updateWellControls(WellState& xw) const; void updateWellControls(WellState& xw) const;

23
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -811,7 +811,7 @@ namespace detail {
} }
asImpl().addWellEq(state, well_state, mob_perfcells, b_perfcells, aliveWells, cq_s); asImpl().addWellEq(state, well_state, mob_perfcells, b_perfcells, aliveWells, cq_s);
addWellContributionToMassBalanceEq(cq_s); asImpl().addWellContributionToMassBalanceEq(state, well_state, cq_s);
addWellControlEq(state, well_state, aliveWells); addWellControlEq(state, well_state, aliveWells);
} }
@ -875,7 +875,9 @@ namespace detail {
template <class Grid, class Implementation> template <class Grid, class Implementation>
void void
BlackoilModelBase<Grid, Implementation>::addWellContributionToMassBalanceEq(const std::vector<ADB>& cq_s) BlackoilModelBase<Grid, Implementation>::addWellContributionToMassBalanceEq(const SolutionState&,
const WellState&,
const std::vector<ADB>& cq_s)
{ {
// Add well contributions to mass balance equations // Add well contributions to mass balance equations
const int nc = Opm::AutoDiffGrid::numCells(grid_); const int nc = Opm::AutoDiffGrid::numCells(grid_);
@ -1038,23 +1040,6 @@ namespace detail {
xw.perfPhaseRates() = cq_d; xw.perfPhaseRates() = cq_d;
residual_.well_flux_eq = qs; residual_.well_flux_eq = qs;
asImpl().extraAddWellEq(state, xw, cq_ps, cmix_s, cqt_is, well_cells);
}
template <class Grid, class Implementation>
void BlackoilModelBase<Grid, Implementation>::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 */)
{
// Does nothing in this model.
} }