portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-13 12:47:05 +01:00
Code Releases Activity

Added iteration reporting to CG and mixed CG

Browse Source 
Added ability to manually change the initial CG inner tolerance in mixed CG
Added .hpp files to filelist script
This commit is contained in:
Christopher Kelly
2017-02-02 17:04:42 -05:00
parent e7d8030a64
commit c94133af49
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/algorithms/iterative/ConjugateGradient.h
View File

@ -45,6 +45,8 @@ class ConjugateGradient : public OperatorFunction<Field> {
// Defaults true.
RealD Tolerance;
Integer MaxIterations;
Integer IterationsToComplete; //Number of iterations the CG took to finish. Filled in upon completion
ConjugateGradient(RealD tol, Integer maxit, bool err_on_no_conv = true)
: Tolerance(tol),
MaxIterations(maxit),
@ -155,13 +157,14 @@ class ConjugateGradient : public OperatorFunction<Field> {
std::cout << std::endl;
if (ErrorOnNoConverge) assert(true_residual / Tolerance < 10000.0);
IterationsToComplete = k;
return;
}
}
std::cout << GridLogMessage << "ConjugateGradient did NOT converge"
<< std::endl;
if (ErrorOnNoConverge) assert(0);
IterationsToComplete = k;
}
};
}