From 8c9010d0f4ca183ab0ef0356797bb84362435e55 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Mon, 21 Dec 2015 15:29:46 +0000
Subject: [PATCH] Isnan check on guess and convergence assert on result

---
 lib/algorithms/iterative/ConjugateGradient.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/algorithms/iterative/ConjugateGradient.h b/lib/algorithms/iterative/ConjugateGradient.h
index b919dd91..022da1a8 100644
--- a/lib/algorithms/iterative/ConjugateGradient.h
+++ b/lib/algorithms/iterative/ConjugateGradient.h
@@ -30,7 +30,8 @@ public:
       
       //Initial residual computation & set up
       RealD guess = norm2(psi);
-      
+      assert(std::isnan(psi)==0);
+
       Linop.HermOpAndNorm(psi,mmp,d,b);
       
       r= src-mmp;
@@ -94,6 +95,9 @@ public:
 		   <<" computed residual "<<sqrt(cp/ssq)
 		   <<" true residual     "<<true_residual
 		   <<" target "<<Tolerance<<std::endl;
+	  
+	  assert(true_residual/Tolerance < 1000.0);
+
 	  return;
 	}
       }