From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 14 Nov 2001 13:31:13 +0000 (+0000)
Subject: Take over changes 1.40->1.41.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=533f8129ae0012db71234bd696d72cda5d6633d0;p=dealii-svn.git

Take over changes 1.40->1.41.


git-svn-id: https://svn.dealii.org/branches/Branch-3-2@5198 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/lac/include/lac/solver_bicgstab.h b/deal.II/lac/include/lac/solver_bicgstab.h
index 4bb4369279..be939f4372 100644
--- a/deal.II/lac/include/lac/solver_bicgstab.h
+++ b/deal.II/lac/include/lac/solver_bicgstab.h
@@ -307,6 +307,8 @@ SolverBicgstab<VECTOR>::iterate(const MATRIX& A,
   
   do
     {
+      ++step;
+      
       rhobar = r*rbar;
       beta   = rhobar * alpha / (rho * omega);
       rho    = rhobar;
@@ -321,7 +323,7 @@ SolverBicgstab<VECTOR>::iterate(const MATRIX& A,
 
       if (std::fabs(alpha) > 1.e10)
 	return true;
-    
+      
       s.equ(1., r, -alpha, v);
       precondition.vmult(z,s);
       A.vmult(t,z);
@@ -335,7 +337,7 @@ SolverBicgstab<VECTOR>::iterate(const MATRIX& A,
       else
 	res = r.l2_norm();
       
-      state = control().check(++step, res);
+      state = control().check(step, res);
       print_vectors(step, *Vx, r, y);
     }
   while (state == SolverControl::iterate);
@@ -370,9 +372,10 @@ SolverBicgstab<VECTOR>::solve(const MATRIX &A,
   
   do 
     {
-      if (step)
+      if (step != 0)
 	deallog << "Restart step " << step << std::endl;
-      if (start(A) == SolverControl::success) break;  
+      if (start(A) == SolverControl::success)
+	break;
       state = iterate(A, precondition);
     }
   while (state);