From 4f3d079afad379ddd5a338b73da27362e5d00f91 Mon Sep 17 00:00:00 2001
From: jiri <jiri>
Date: Fri, 27 Oct 2006 13:40:09 +0000
Subject: [PATCH] *** empty log message ***

---
 conjgrad.h | 10 +++++++---
 gmres.h    |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/conjgrad.h b/conjgrad.h
index f27d590..d9d9905 100644
--- a/conjgrad.h
+++ b/conjgrad.h
@@ -13,7 +13,7 @@
 
 
 template<typename T, typename Matrix>
-extern void conjgrad(const Matrix &bigmat, const NRVec<T> &b, NRVec<T> &x, const bool doguess, const double tol, const int itmax, const bool verbose, bool issquare,const bool precondition)
+extern bool conjgrad(const Matrix &bigmat, const NRVec<T> &b, NRVec<T> &x, const bool doguess, const double tol, const int itmax, const bool verbose, bool issquare,const bool precondition)
 {
 int m=bigmat.nrows();
 int n=bigmat.ncols();
@@ -47,7 +47,11 @@ for(int iter=0; iter<= itmax; iter++)
 	if(verbose) cout << "conjgrad: iter= "<<iter<<" err= "<<
 		setiosflags(ios::scientific)<<setprecision(8) <<err<<
 		resetiosflags(ios::scientific)<<setprecision(12)<<"\n";
-	if(err <= tol) break;
+	if(err <= tol)
+		{
+		if(!issquare) delete r;
+		return true;
+		} 
 
 	bigmat.gemv(0,q,'n',1,p); //q.gemv(0,bigmat,'n',1,p);
 	tt= (*r) * rr;
@@ -66,6 +70,6 @@ for(int iter=0; iter<= itmax; iter++)
 	}
 
 if(!issquare) delete r;
-
+return false;
 }
 
diff --git a/gmres.h b/gmres.h
index 7bc3627..8dbfbab 100644
--- a/gmres.h
+++ b/gmres.h
@@ -28,7 +28,7 @@ for (int i=k-1;i>=0;i--) c[i] = (d[i]-xdot(k-i,&R(i,i+1),1,&c[i+1],1)) / R(i,i);
 
 //x contains ev. initial guess and on return the solution
 template<typename T, typename Matrix>
-void gmres(const Matrix &bigmat, const NRVec<T> &b, NRVec<T> &x, const bool doguess=1, const double eps=1e-7, const int MAXIT=50, const bool verbose=1, bool square=1,const bool precondition=1, int neustart=0, const int incore=1)
+bool gmres(const Matrix &bigmat, const NRVec<T> &b, NRVec<T> &x, const bool doguess=1, const double eps=1e-7, const int MAXIT=50, const bool verbose=1, bool square=1,const bool precondition=1, int neustart=0, const int incore=1)
 {
 int zeilen=bigmat.nrows();
 int spalten=bigmat.ncols();
@@ -232,6 +232,6 @@ myreturn:
 delete[] v;
 if(!incore) delete st;
 
-if(flag) laerror("no convergence in GMRES");
+return !flag;
 }