Skip to content
Snippets Groups Projects
Commit 3d4d2937 authored by Oliver Sander's avatar Oliver Sander Committed by sander@PCPOOL.MI.FU-BERLIN.DE
Browse files

maxtotalConvrate is now in a base class

[[Imported from SVN: r2442]]
parent 5224000a
Branches
No related tags found
No related merge requests found
......@@ -52,7 +52,7 @@ void CGSolver<MatrixType, VectorType>::solve()
double normOfOldCorrection = 0;
double totalConvRate = 1;
maxTotalConvRate_ = 0;
this->maxTotalConvRate_ = 0;
int convRateCounter = 0;
// overwrite b with defect
......@@ -122,7 +122,7 @@ void CGSolver<MatrixType, VectorType>::solve()
if (!isinf(convRate) && !isnan(convRate)) {
totalConvRate *= convRate;
maxTotalConvRate_ = std::max(maxTotalConvRate_, std::pow(totalConvRate, 1/((double)convRateCounter+1)));
this->maxTotalConvRate_ = std::max(this->maxTotalConvRate_, std::pow(totalConvRate, 1/((double)convRateCounter+1)));
convRateCounter++;
}
......@@ -145,7 +145,7 @@ void CGSolver<MatrixType, VectorType>::solve()
if (this->verbosity_ != NumProc::QUIET) {
std::cout << "maxTotalConvRate: " << maxTotalConvRate_ << ", "
std::cout << "maxTotalConvRate: " << this->maxTotalConvRate_ << ", "
<< i << " iterations performed\n";
std::cout << "--------------------\n";
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment