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

[cleanup] ilu_iteration --> ilu_fillin_level.

Browse Source
This commit is contained in:
Robert Kloefkorn
2017-06-02 14:52:49 +02:00
parent 0b90b7863b
commit e3c898030c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/ISTLSolver.hpp
View File

@@ -295,8 +295,8 @@ namespace Opm
std::unique_ptr<SeqPreconditioner> constructPrecond(Operator& opA, const Dune::Amg::SequentialInformation&) const std::unique_ptr<SeqPreconditioner> constructPrecond(Operator& opA, const Dune::Amg::SequentialInformation&) const
{ {
const double relax = parameters_.ilu_relaxation_; const double relax = parameters_.ilu_relaxation_;
const int iteration = parameters_.ilu_iteration_; const int ilu_fillin = parameters_.ilu_fillin_level_;
std::unique_ptr<SeqPreconditioner> precond(new SeqPreconditioner(opA.getmat(), iteration, relax)); std::unique_ptr<SeqPreconditioner> precond(new SeqPreconditioner(opA.getmat(), ilu_fillin, relax));
return precond; return precond;
} }

6
opm/autodiff/NewtonIterationBlackoilInterleaved.hpp
View File

@@ -41,7 +41,7 @@ namespace Opm
int linear_solver_maxiter_; int linear_solver_maxiter_;
int linear_solver_restart_; int linear_solver_restart_;
int linear_solver_verbosity_; int linear_solver_verbosity_;
int ilu_iteration_; int ilu_fillin_level_;
bool newton_use_gmres_; bool newton_use_gmres_;
bool require_full_sparsity_pattern_; bool require_full_sparsity_pattern_;
bool ignoreConvergenceFailure_; bool ignoreConvergenceFailure_;
@@ -64,7 +64,7 @@ namespace Opm
ignoreConvergenceFailure_ = param.getDefault("linear_solver_ignoreconvergencefailure", ignoreConvergenceFailure_); ignoreConvergenceFailure_ = param.getDefault("linear_solver_ignoreconvergencefailure", ignoreConvergenceFailure_);
linear_solver_use_amg_ = param.getDefault("linear_solver_use_amg", linear_solver_use_amg_ ); linear_solver_use_amg_ = param.getDefault("linear_solver_use_amg", linear_solver_use_amg_ );
ilu_relaxation_ = param.getDefault("ilu_relaxation", ilu_relaxation_ ); ilu_relaxation_ = param.getDefault("ilu_relaxation", ilu_relaxation_ );
ilu_iteration_ = param.getDefault("ilu_iteration", ilu_iteration_ ); ilu_fillin_level_ = param.getDefault("ilu_fillin_level", ilu_fillin_level_ );
} }
// set default values // set default values
@@ -78,7 +78,7 @@ namespace Opm
require_full_sparsity_pattern_ = false; require_full_sparsity_pattern_ = false;
ignoreConvergenceFailure_ = false; ignoreConvergenceFailure_ = false;
linear_solver_use_amg_ = false; linear_solver_use_amg_ = false;
ilu_iteration_ = 0; ilu_fillin_level_ = 0;
ilu_relaxation_ = 0.9; ilu_relaxation_ = 0.9;
} }
}; };