public accessibility of AdditionalData in PreconditionBlockSOR\

bug in GMRES

git-svn-id: https://svn.dealii.org/trunk@21255 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/lac/include/lac/precondition_block.h b/deal.II/lac/include/lac/precondition_block.h
index b00e602e536cae49be8414cc9bee24ec2f5bf1b4..98c28bc98bb24c2554625326e8fb44bba50206d1 100644 (file)
--- a/deal.II/lac/include/lac/precondition_block.h
+++ b/deal.II/lac/include/lac/precondition_block.h
@@ -813,6 +813,11 @@ class PreconditionBlockSOR : public virtual Subscriptor,
                                      */
     typedef typename MATRIX::value_type number;
     
+                                    /**
+                                     * Make type publicly available.
+                                     */
+    PreconditionBlock<MATRIX,inverse_type>::AdditionalData;
+    
                                     /**
                                      * Make initialization function
                                      * publicly available.
@@ -1008,6 +1013,12 @@ class PreconditionBlockSSOR : public virtual Subscriptor,
                                      * Constructor.
                                      */
     PreconditionBlockSSOR ();
+
+                                    /**
+                                     * Make type publicly available.
+                                     */
+    PreconditionBlockSOR<MATRIX,inverse_type>::AdditionalData;
+    
                                     /**
                                      * Make initialization function
                                      * publicly available.

diff --git a/deal.II/lac/include/lac/solver_gmres.h b/deal.II/lac/include/lac/solver_gmres.h
index 6c07e0304ebc772146824a5327e0d4125e8f5eca..e14a1b5108e790dd729e99b13e34a85fdae650c8 100644 (file)
--- a/deal.II/lac/include/lac/solver_gmres.h
+++ b/deal.II/lac/include/lac/solver_gmres.h
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 by the deal.II authors
+//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -706,7 +706,8 @@ SolverGMRES<VECTOR>::solve (const MATRIX         &A,
 
          const double s = vv.l2_norm();
          h(inner_iteration+1) = s;
-
+//TODO: s=0 is a lucky breakdown. Handle this somehow decently
+         
          vv *= 1./s;
 
                                           /*  Transformation into