From 165c68e28efd5b53415aea9cce7680824bba223e Mon Sep 17 00:00:00 2001
From: Carleton DeTar <tg455530@login1.stampede2.tacc.utexas.edu>
Date: Sat, 29 Feb 2020 17:51:51 -0600
Subject: [PATCH] Change TrueResiduals to TrueResidualShift and
 IterationsToComplete to IterationsToCompleteShift

---
 .../iterative/BlockConjugateGradient.h        |  6 ++---
 Grid/algorithms/iterative/ConjugateGradient.h |  4 ++--
 .../iterative/ConjugateGradientMultiShift.h   | 24 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Grid/algorithms/iterative/BlockConjugateGradient.h b/Grid/algorithms/iterative/BlockConjugateGradient.h
index 14707d7b..75a8be06 100644
--- a/Grid/algorithms/iterative/BlockConjugateGradient.h
+++ b/Grid/algorithms/iterative/BlockConjugateGradient.h
@@ -308,7 +308,7 @@ void BlockCGrQsolve(LinearOperatorBase<Field> &Linop, const Field &B, Field &X)
       Linop.HermOp(X, AD);
       AD = AD-B;
       TrueResidual = std::sqrt(norm2(AD)/norm2(B));
-      std::cout << GridLogMessage <<"\t True residual is " << TrueResidual <<std::endl;
+      std::cout << GridLogMessage <<"\tTrue residual is " << TrueResidual <<std::endl;
 
       std::cout << GridLogMessage << "Time Breakdown "<<std::endl;
       std::cout << GridLogMessage << "\tElapsed    " << SolverTimer.Elapsed()     <<std::endl;
@@ -656,7 +656,7 @@ void BlockCGrQsolveVec(LinearOperatorBase<Field> &Linop, const std::vector<Field
       if ( rr > max_resid ) max_resid = rr;
     }
 
-    std::cout << GridLogIterative << "\t Block Iteration "<<k<<" ave resid "<< sqrt(rrsum/sssum) << " max "<< sqrt(max_resid) <<std::endl;
+    std::cout << GridLogIterative << "\t Block Iteration "<<k<<" ave resid "<< std::sqrt(rrsum/sssum) << " max "<< std::sqrt(max_resid) <<std::endl;
 
     if ( max_resid < Tolerance*Tolerance ) { 
 
@@ -672,7 +672,7 @@ void BlockCGrQsolveVec(LinearOperatorBase<Field> &Linop, const std::vector<Field
       for(int b=0;b<Nblock;b++) Linop.HermOp(X[b], AD[b]);
       for(int b=0;b<Nblock;b++) AD[b] = AD[b]-B[b];
       TrueResidual = std::sqrt(normv(AD)/normv(B));
-      std::cout << GridLogMessage <<"\t True residual is " << TrueResidual <<std::endl;
+      std::cout << GridLogMessage << "\tTrue residual is " << TrueResidual <<std::endl;
 
       std::cout << GridLogMessage << "Time Breakdown "<<std::endl;
       std::cout << GridLogMessage << "\tElapsed    " << SolverTimer.Elapsed()     <<std::endl;
diff --git a/Grid/algorithms/iterative/ConjugateGradient.h b/Grid/algorithms/iterative/ConjugateGradient.h
index 160cb185..e5972479 100644
--- a/Grid/algorithms/iterative/ConjugateGradient.h
+++ b/Grid/algorithms/iterative/ConjugateGradient.h
@@ -85,7 +85,7 @@ public:
 
     // Handle trivial case of zero src
     if (ssq == 0.){
-      psi = 0;
+      psi = Zero();
       IterationsToComplete = 1;
       TrueResidual = 0.;
       return;
@@ -102,7 +102,7 @@ public:
 
     // Check if guess is really REALLY good :)
     if (cp <= rsq) {
-      TrueResidual = sqrt(a/ssq);
+      TrueResidual = std::sqrt(a/ssq);
       std::cout << GridLogMessage << "ConjugateGradient guess is converged already " << std::endl;
       IterationsToComplete = 0;	
       return;
diff --git a/Grid/algorithms/iterative/ConjugateGradientMultiShift.h b/Grid/algorithms/iterative/ConjugateGradientMultiShift.h
index b8b7e056..63a6c55f 100644
--- a/Grid/algorithms/iterative/ConjugateGradientMultiShift.h
+++ b/Grid/algorithms/iterative/ConjugateGradientMultiShift.h
@@ -46,19 +46,19 @@ public:
 
   RealD   Tolerance;
   Integer MaxIterations;
-  std::vector<int> IterationsToComplete;
-  //    Integer IterationsToComplete; //Number of iterations the CG took to finish. Filled in upon completion
+  Integer IterationsToComplete; //Number of iterations the CG took to finish. Filled in upon completion
+  std::vector<int> IterationsToCompleteShift;  // Iterations for this shift
   int verbose;
   MultiShiftFunction shifts;
-  std::vector<RealD> TrueResiduals;
+  std::vector<RealD> TrueResidualShift;
 
   ConjugateGradientMultiShift(Integer maxit,MultiShiftFunction &_shifts) : 
     MaxIterations(maxit),
     shifts(_shifts)
   { 
     verbose=1;
-    IterationsToComplete.resize(_shifts.order);
-    TrueResiduals.resize(_shifts.order);
+    IterationsToCompleteShift.resize(_shifts.order);
+    TrueResidualShift.resize(_shifts.order);
   }
 
   void operator() (LinearOperatorBase<Field> &Linop, const Field &src, Field &psi)
@@ -133,9 +133,9 @@ public:
     // Handle trivial case of zero src.
     if( cp == 0. ){
       for(int s=0;s<nshift;s++){
-	psi[s] = 0;
-	IterationsToComplete[s] = 1;
-	TrueResiduals[s] = 0.;
+	psi[s] = Zero();
+	IterationsToCompleteShift[s] = 1;
+	TrueResidualShift[s] = 0.;
       }
       return;
     }
@@ -285,7 +285,7 @@ public:
       for(int s=0;s<nshift;s++){
       
 	if ( (!converged[s]) ){
-	  IterationsToComplete[s] = k;
+	  IterationsToCompleteShift[s] = k;
 	
 	  RealD css  = c * z[s][iz]* z[s][iz];
 	
@@ -315,8 +315,8 @@ public:
 	  axpy(r,-alpha[s],src,tmp);
 	  RealD rn = norm2(r);
 	  RealD cn = norm2(src);
-	  TrueResiduals[s] = std::sqrt(rn/cn);
-	  std::cout<<GridLogMessage<<"CGMultiShift: shift["<<s<<"] true residual "<< TrueResiduals[s] <<std::endl;
+	  TrueResidualShift[s] = std::sqrt(rn/cn);
+	  std::cout<<GridLogMessage<<"CGMultiShift: shift["<<s<<"] true residual "<< TrueResidualShift[s] <<std::endl;
 	}
 
       std::cout << GridLogMessage << "Time Breakdown "<<std::endl;
@@ -325,7 +325,7 @@ public:
       std::cout << GridLogMessage << "\tMarix    " << MatrixTimer.Elapsed()     <<std::endl;
       std::cout << GridLogMessage << "\tShift    " << ShiftTimer.Elapsed()     <<std::endl;
 
-      //      IterationsToComplete = k;	
+      IterationsToComplete = k;	
 
 	return;
       }