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

return IterationReport for assemble and solver well eq methods.

Browse Source
This commit is contained in:
Liu Ming
2016-06-28 14:37:48 +08:00
parent 9bf934363c
commit c6586d36c8
6 changed files with 49 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,10 +120,10 @@ namespace Opm {
/// \param[in] reservoir_state reservoir state variables
/// \param[in, out] well_state well state variables
/// \param[in] initial_assembly pass true if this is the first call to assemble() in this timestep
void assemble(const ReservoirState& reservoir_state,
WellState& well_state,
const bool initial_assembly,
int& well_iters);
IterationReport
assemble(const ReservoirState& reservoir_state,
WellState& well_state,
const bool initial_assembly);
protected:

11
opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp
View File

@@ -489,11 +489,10 @@ namespace Opm {
template <class Grid>
void
IterationReport
BlackoilPolymerModel<Grid>::assemble(const ReservoirState& reservoir_state,
WellState& well_state,
const bool initial_assembly,
int& well_iters)
const bool initial_assembly)
{
using namespace Opm::AutoDiffGrid;
@@ -527,10 +526,10 @@ namespace Opm {
// -------- Mass balance equations --------
assembleMassBalanceEq(state);
IterationReport iter_report;
// -------- Well equations ----------
if ( ! wellsActive() ) {
return;
return iter_report;
}
std::vector<ADB> mob_perfcells;
@@ -538,7 +537,7 @@ namespace Opm {
wellModel().extractWellPerfProperties(state, rq_, mob_perfcells, b_perfcells);
if (param_.solve_welleq_initially_ && initial_assembly) {
// solve the well equations as a pre-processing step
Base::solveWellEq(mob_perfcells, b_perfcells, state, well_state, well_iters);
Base::solveWellEq(mob_perfcells, b_perfcells, state, well_state);
}
V aliveWells;