OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-02 12:36:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'specifying_maximum_iterations' into oscillation_treatment_withlimitedupdate

Browse Source 
Conflicts:
	opm/autodiff/FullyImplicitBlackoilSolver.hpp
	opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
This commit is contained in:
Kai Bao 2014-05-22 22:13:14 +02:00
commit cd174c5ba4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@ -151,6 +151,7 @@ namespace Opm {
double relax_max_;
double relax_increment_;
double relax_rel_tol_;
int max_iter_;
std::vector<ReservoirResidualQuant> rq_;
std::vector<PhasePresence> phaseCondition_;
@ -295,6 +296,7 @@ namespace Opm {
double relaxMax() const { return relax_max_; };
double relaxIncrement() const { return relax_increment_; };
double relaxRelTol() const { return relax_rel_tol_; };
double maxIter() const { return max_iter_; }
};
} // namespace Opm

5
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -239,6 +239,7 @@ namespace {
, relax_max_ (0.5)
, relax_increment_ (0.1)
, relax_rel_tol_ (0.2)
, max_iter_ (15)
, rq_ (fluid.numPhases())
, phaseCondition_(AutoDiffGrid::numCells(grid))
, residual_ ( { std::vector<ADB>(fluid.numPhases(), ADB::null()),
@ -249,6 +250,7 @@ namespace {
ds_max_ = param.getDefault("ds_max", ds_max_);
drs_max_rel_ = param.getDefault("drs_max_rel", drs_max_rel_);
relax_max_ = param.getDefault("relax_max", relax_max_);
max_iter_ = param.getDefault("max_iter", max_iter_);
std::string relaxtion_type = param.getDefault("relax_type", std::string("dampen"));
if (relaxtion_type.compare(std::string("dampen")) == 0) {
@ -277,7 +279,6 @@ namespace {
computeWellConnectionPressures(state, xw);
}
const int maxit = 15;
std::vector<std::vector<double>> residual_history;
@ -319,7 +320,7 @@ namespace {
bool isStagnate = false;
const enum RelaxType relaxtype = relaxType();
while ((!converged) && (it < maxit)) {
while ((!converged) && (it < maxIter())) {
V dx = solveJacobianSystem();
detectNewtonOscillations(residual_history, it, relaxRelTol(), isOscillate, isStagnate);