portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-11-04 05:54:32 +00:00
Code Releases Activity

Rename misunderstood "rsd_sq" to "rsq" in GMRES code

Browse Source
This commit is contained in:
Daniel Richtmann
2017-11-08 14:40:03 +01:00
parent 37b777d801
commit 8107b785cc
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/algorithms/iterative/GeneralisedMinimalResidual.h
View File

@@ -98,7 +98,7 @@ class GeneralisedMinimalResidual : public OperatorFunction<Field> {
RealD cp;
RealD ssq = norm2(src);
RealD rsd_sq = Tolerance * Tolerance * ssq;
RealD rsq = Tolerance * Tolerance * ssq;
Field r(src._grid);
@@ -119,10 +119,10 @@ class GeneralisedMinimalResidual : public OperatorFunction<Field> {
IterationCount = 0;
for (int k=0; k<MaxIterations; k++) {
cp = outerLoopBody(LinOp, src, psi, rsd_sq);
cp = outerLoopBody(LinOp, src, psi, rsq);
// Stopping condition
if (cp <= rsd_sq) {
if (cp <= rsq) {
SolverTimer.Stop();
@@ -155,7 +155,7 @@ class GeneralisedMinimalResidual : public OperatorFunction<Field> {
assert(0);
}
RealD outerLoopBody(LinearOperatorBase<Field> &LinOp, const Field &src, Field &psi, RealD rsd_sq) {
RealD outerLoopBody(LinearOperatorBase<Field> &LinOp, const Field &src, Field &psi, RealD rsq) {
RealD cp = 0;
@@ -187,9 +187,9 @@ class GeneralisedMinimalResidual : public OperatorFunction<Field> {
cp = std::norm(gamma[i+1]);
std::cout << GridLogIterative << "GeneralisedMinimalResidual: Iteration " << IterationCount
<< " residual " << cp << " target " << rsd_sq << std::endl;
<< " residual " << cp << " target " << rsq << std::endl;
if ((i == RestartLength - 1) || (cp <= rsd_sq)) {
if ((i == RestartLength - 1) || (cp <= rsq)) {
computeSolution(v, psi, i);