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 well iteration from simulators.

Browse Source
This commit is contained in:
Liu Ming 2016-06-20 16:25:35 +08:00
parent 6dfd5ec63d
commit 969f6f1d1b
7 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilModelBase.hpp
View File

@ -82,6 +82,7 @@ namespace Opm {
bool failed;
bool converged;
int linear_iterations;
int well_iterations;
};
@ -196,9 +197,11 @@ 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
/// \return well iterations.
void assemble(const ReservoirState& reservoir_state,
WellState& well_state,
const bool initial_assembly);
const bool initial_assembly,
int& well_iters);
/// \brief Compute the residual norms of the mass balance for each phase,
/// the well flux, and the well equation.
@ -377,7 +380,8 @@ namespace Opm {
solveWellEq(const std::vector<ADB>& mob_perfcells,
const std::vector<ADB>& b_perfcells,
SolutionState& state,
WellState& well_state);
WellState& well_state,
int& well_iters);
void
addWellContributionToMassBalanceEq(const std::vector<ADB>& cq_s,

17
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -288,7 +288,8 @@ namespace detail {
current_relaxation_ = 1.0;
dx_old_ = V::Zero(sizeNonLinear());
}
asImpl().assemble(reservoir_state, well_state, iteration == 0);
int well_iters = 0;
asImpl().assemble(reservoir_state, well_state, iteration == 0, well_iters);
residual_norms_history_.push_back(asImpl().computeResidualNorms());
const bool converged = asImpl().getConvergence(dt, iteration);
const bool must_solve = (iteration < nonlinear_solver.minIter()) || (!converged);
@ -322,7 +323,7 @@ namespace detail {
}
const bool failed = false; // Not needed in this model.
const int linear_iters = must_solve ? asImpl().linearIterationsLastSolve() : 0;
return IterationReport{ failed, converged, linear_iters };
return IterationReport{ failed, converged, linear_iters , well_iters};
}
@ -731,7 +732,8 @@ namespace detail {
BlackoilModelBase<Grid, WellModel, Implementation>::
assemble(const ReservoirState& reservoir_state,
WellState& well_state,
const bool initial_assembly)
const bool initial_assembly,
int& well_iters)
{
using namespace Opm::AutoDiffGrid;
@ -785,7 +787,7 @@ namespace detail {
asImpl().wellModel().extractWellPerfProperties(state, rq_, mob_perfcells, b_perfcells);
if (param_.solve_welleq_initially_ && initial_assembly) {
// solve the well equations as a pre-processing step
asImpl().solveWellEq(mob_perfcells, b_perfcells, state, well_state);
asImpl().solveWellEq(mob_perfcells, b_perfcells, state, well_state, well_iters);
}
V aliveWells;
std::vector<ADB> cq_s;
@ -799,8 +801,7 @@ namespace detail {
SolutionState state0 = state;
asImpl().makeConstantState(state0);
asImpl().wellModel().computeWellPotentials(mob_perfcells, b_perfcells, state0, well_state);
}
}
}
@ -976,7 +977,8 @@ namespace detail {
solveWellEq(const std::vector<ADB>& mob_perfcells,
const std::vector<ADB>& b_perfcells,
SolutionState& state,
WellState& well_state)
WellState& well_state,
int& well_iters)
{
V aliveWells;
const int np = wells().number_of_phases;
@ -1041,6 +1043,7 @@ namespace detail {
} while (it < 15);
if (converged) {
well_iters = it;
if ( terminal_output_ ) {
OpmLog::info("well converged iter: " + std::to_string(it));
}

6
opm/autodiff/BlackoilMultiSegmentModel.hpp
View File

@ -107,7 +107,8 @@ namespace Opm {
/// \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);
const bool initial_assembly,
int& well_iters);
using Base::numPhases;
using Base::numMaterials;
@ -168,7 +169,8 @@ namespace Opm {
solveWellEq(const std::vector<ADB>& mob_perfcells,
const std::vector<ADB>& b_perfcells,
SolutionState& state,
WellState& well_state);
WellState& well_state,
int& well_iters);
void
makeConstantState(SolutionState& state) const;

10
opm/autodiff/BlackoilMultiSegmentModel_impl.hpp
View File

@ -130,7 +130,8 @@ namespace Opm {
BlackoilMultiSegmentModel<Grid>::
assemble(const ReservoirState& reservoir_state,
WellState& well_state,
const bool initial_assembly)
const bool initial_assembly,
int& well_iters)
{
using namespace Opm::AutoDiffGrid;
@ -197,7 +198,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
asImpl().solveWellEq(mob_perfcells, b_perfcells, state, well_state);
asImpl().solveWellEq(mob_perfcells, b_perfcells, state, well_state, well_iters);
}
// the perforation flux here are different
@ -219,9 +220,10 @@ namespace Opm {
bool BlackoilMultiSegmentModel<Grid>::solveWellEq(const std::vector<ADB>& mob_perfcells,
const std::vector<ADB>& b_perfcells,
SolutionState& state,
WellState& well_state)
WellState& well_state,
int& well_iters)
{
const bool converged = Base::solveWellEq(mob_perfcells, b_perfcells, state, well_state);
const bool converged = Base::solveWellEq(mob_perfcells, b_perfcells, state, well_state, well_iters);
if (converged) {
// We must now update the state.segp and state.segqs members,

4
opm/autodiff/NonlinearSolver_impl.hpp
View File

@ -110,6 +110,7 @@ namespace Opm
// Set up for main solver loop.
int linIters = 0;
bool converged = false;
int wellIters = 0;
// ---------- Main nonlinear solver loop ----------
do {
@ -122,6 +123,7 @@ namespace Opm
}
converged = report.converged;
linIters += report.linear_iterations;
wellIters += report.well_iterations;
++iteration;
} while ( (!converged && (iteration <= maxIter())) || (iteration <= minIter()));
@ -134,8 +136,10 @@ namespace Opm
linearIterations_ += linIters;
nonlinearIterations_ += iteration - 1; // Since the last one will always be trivial.
wellIterations_ += wellIters;
linearIterationsLast_ = linIters;
nonlinearIterationsLast_ = iteration;
wellIterationsLast_ = wellIters;
// Do model-specific post-step actions.
model_->afterStep(dt, reservoir_state, well_state);

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

@ -122,7 +122,8 @@ namespace Opm {
/// \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);
const bool initial_assembly,
int& well_iters);
protected:

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

@ -492,7 +492,8 @@ namespace Opm {
void
BlackoilPolymerModel<Grid>::assemble(const ReservoirState& reservoir_state,
WellState& well_state,
const bool initial_assembly)
const bool initial_assembly,
int& well_iters)
{
using namespace Opm::AutoDiffGrid;
@ -537,7 +538,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);
Base::solveWellEq(mob_perfcells, b_perfcells, state, well_state, well_iters);
}
V aliveWells;