CPR: add verbosity as a parameter.

This commit is contained in:
Robert Kloefkorn 2015-03-31 12:54:26 +02:00
parent 632bc7a809
commit 1b23de0b1c

View File

@ -275,6 +275,7 @@ createEllipticPreconditionerPointer(const M& Ae, double relax,
int cpr_max_ell_iter_; int cpr_max_ell_iter_;
bool cpr_use_amg_; bool cpr_use_amg_;
bool cpr_use_bicgstab_; bool cpr_use_bicgstab_;
bool cpr_solver_verbose_;
CPRParameter() { reset(); } CPRParameter() { reset(); }
@ -289,6 +290,7 @@ createEllipticPreconditionerPointer(const M& Ae, double relax,
cpr_max_ell_iter_ = param.getDefault("cpr_max_elliptic_iter",cpr_max_ell_iter_); cpr_max_ell_iter_ = param.getDefault("cpr_max_elliptic_iter",cpr_max_ell_iter_);
cpr_use_amg_ = param.getDefault("cpr_use_amg", cpr_use_amg_); cpr_use_amg_ = param.getDefault("cpr_use_amg", cpr_use_amg_);
cpr_use_bicgstab_ = param.getDefault("cpr_use_bicgstab", cpr_use_bicgstab_); cpr_use_bicgstab_ = param.getDefault("cpr_use_bicgstab", cpr_use_bicgstab_);
cpr_solver_verbose_ = param.getDefault("cpr_solver_verbose", cpr_solver_verbose_);
} }
void reset() void reset()
@ -299,6 +301,7 @@ createEllipticPreconditionerPointer(const M& Ae, double relax,
cpr_max_ell_iter_ = 5000; cpr_max_ell_iter_ = 5000;
cpr_use_amg_ = false; cpr_use_amg_ = false;
cpr_use_bicgstab_ = true; cpr_use_bicgstab_ = true;
cpr_solver_verbose_ = false;
} }
}; };
@ -457,7 +460,7 @@ createEllipticPreconditionerPointer(const M& Ae, double relax,
// Linear solver parameters // Linear solver parameters
const double tolerance = param_.cpr_solver_tol_; const double tolerance = param_.cpr_solver_tol_;
const int maxit = param_.cpr_max_ell_iter_; const int maxit = param_.cpr_max_ell_iter_;
const int verbosity = 0; const int verbosity = param_.cpr_solver_verbose_ ? 1 : 0;
// operator result containing iterations etc. // operator result containing iterations etc.
Dune::InverseOperatorResult result; Dune::InverseOperatorResult result;