Merge remote-tracking branch 'origin/master' into feature/amg-sharedptr

Resolved conflicts:
	dune/istl/paamg/fastamg.hh

dune/istl/bvector.hh

@@ -164,49 +164,49 @@ namespace Dune {
     //===== norms
 
     //! one norm (sum over absolute values of entries)
-    double one_norm () const
+    typename FieldTraits<value_type>::real_type one_norm () const
     {
-      double sum=0;
+      typename FieldTraits<value_type>::real_type sum=0;
       for (size_type i=0; i<this->n; ++i) sum += (*this)[i].one_norm();
       return sum;
     }
 
     //! simplified one norm (uses Manhattan norm for complex values)
-    double one_norm_real () const
+    typename FieldTraits<value_type>::real_type one_norm_real () const
     {
-      double sum=0;
+      typename FieldTraits<value_type>::real_type sum=0;
       for (size_type i=0; i<this->n; ++i) sum += (*this)[i].one_norm_real();
       return sum;
     }
 
     //! two norm sqrt(sum over squared values of entries)
-    double two_norm () const
+    typename FieldTraits<value_type>::real_type two_norm () const
     {
-      double sum=0;
+      typename FieldTraits<value_type>::real_type sum=0;
       for (size_type i=0; i<this->n; ++i) sum += (*this)[i].two_norm2();
       return sqrt(sum);
     }
 
     //! sqare of two norm (sum over squared values of entries), need for block recursion
-    double two_norm2 () const
+    typename FieldTraits<value_type>::real_type two_norm2 () const
     {
-      double sum=0;
+      typename FieldTraits<value_type>::real_type sum=0;
       for (size_type i=0; i<this->n; ++i) sum += (*this)[i].two_norm2();
       return sum;
     }
 
     //! infinity norm (maximum of absolute values of entries)
-    double infinity_norm () const
+    typename FieldTraits<value_type>::real_type infinity_norm () const
     {
-      double max=0;
+      typename FieldTraits<value_type>::real_type max=0;
       for (size_type i=0; i<this->n; ++i) max = std::max(max,(*this)[i].infinity_norm());
       return max;
     }
 
     //! simplified infinity norm (uses Manhattan norm for complex values)
-    double infinity_norm_real () const
+    typename FieldTraits<value_type>::real_type infinity_norm_real () const
     {
-      double max=0;
+      typename FieldTraits<value_type>::real_type max=0;
       for (size_type i=0; i<this->n; ++i) max = std::max(max,(*this)[i].infinity_norm_real());
       return max;
     }
@@ -809,49 +809,49 @@ namespace Dune {
     //===== norms
 
     //! one norm (sum over absolute values of entries)
-    double one_norm () const
+    typename FieldTraits<field_type>::real_type one_norm () const
     {
-      double sum=0;
+      typename FieldTraits<field_type>::real_type sum=0;
       for (size_type i=0; i<this->n; ++i) sum += (this->p)[i].one_norm();
       return sum;
     }
 
     //! simplified one norm (uses Manhattan norm for complex values)
-    double one_norm_real () const
+    typename FieldTraits<field_type>::real_type one_norm_real () const
     {
-      double sum=0;
+      typename FieldTraits<field_type>::real_type sum=0;
       for (size_type i=0; i<this->n; ++i) sum += (this->p)[i].one_norm_real();
       return sum;
     }
 
     //! two norm sqrt(sum over squared values of entries)
-    double two_norm () const
+    typename FieldTraits<field_type>::real_type two_norm () const
     {
-      double sum=0;
+      typename FieldTraits<field_type>::real_type sum=0;
       for (size_type i=0; i<this->n; ++i) sum += (this->p)[i].two_norm2();
       return sqrt(sum);
     }
 
     //! sqare of two norm (sum over squared values of entries), need for block recursion
-    double two_norm2 () const
+    typename FieldTraits<field_type>::real_type two_norm2 () const
     {
-      double sum=0;
+      typename FieldTraits<field_type>::real_type sum=0;
       for (size_type i=0; i<this->n; ++i) sum += (this->p)[i].two_norm2();
       return sum;
     }
 
     //! infinity norm (maximum of absolute values of entries)
-    double infinity_norm () const
+    typename FieldTraits<field_type>::real_type infinity_norm () const
     {
-      double max=0;
+      typename FieldTraits<field_type>::real_type max=0;
       for (size_type i=0; i<this->n; ++i) max = std::max(max,(this->p)[i].infinity_norm());
       return max;
     }
 
     //! simplified infinity norm (uses Manhattan norm for complex values)
-    double infinity_norm_real () const
+    typename FieldTraits<field_type>::real_type infinity_norm_real () const
     {
-      double max=0;
+      typename FieldTraits<field_type>::real_type max=0;
       for (size_type i=0; i<this->n; ++i) max = std::max(max,(this->p)[i].infinity_norm_real());
       return max;
     }

dune/istl/paamg/smoother.hh

@@ -458,7 +458,7 @@ namespace Dune
   template<class M, class X, class MO, class MS, class A>
   class SeqOverlappingSchwarz;
 
-  class MultiplicativeSchwarzMode;
+  struct MultiplicativeSchwarzMode;
 
   namespace Amg
   {

dune/istl/solver.hh

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
 
-#ifndef DUNE_SOLVER_HH
-#define DUNE_SOLVER_HH
+#ifndef DUNE_ISTL_SOLVER_HH
+#define DUNE_ISTL_SOLVER_HH
 
 #include <iomanip>
 #include <ostream>

dune/istl/test/.gitignore

@@ -19,6 +19,7 @@ superlztest
 mmtest
 mv
 iotest
+inverseoperator2prectest
 scaledidmatrixtest
 basearraytest
 vbvectortest