make apply<forward> work with BlockPreconditioner and NonoverlappingBlockPreconditioner

dune/istl/novlpschwarz.hh

@@ -289,7 +289,7 @@ namespace Dune {
        \param c The communication object for syncing overlap and copy
        data points. (E.~g. OwnerOverlapCopyCommunication )
      */
-    NonoverlappingBlockPreconditioner (Preconditioner<X,Y>& p, const communication_type& c)
+    NonoverlappingBlockPreconditioner (P& p, const communication_type& c)
       : _preconditioner(stackobject_to_shared_ptr(p)), _communication(c)
     {   }
 
@@ -300,7 +300,7 @@ namespace Dune {
        \param c The communication object for syncing overlap and copy
        data points. (E.~g. OwnerOverlapCopyCommunication )
      */
-    NonoverlappingBlockPreconditioner (const std::shared_ptr<Preconditioner<X,Y>>& p, const communication_type& c)
+    NonoverlappingBlockPreconditioner (const std::shared_ptr<P>& p, const communication_type& c)
       : _preconditioner(p), _communication(c)
     {   }
 
@@ -328,6 +328,13 @@ namespace Dune {
       _communication.addOwnerCopyToOwnerCopy(v,v);
     }
 
+    template<bool forward>
+    void apply (X& v, const Y& d)
+    {
+      _preconditioner->template apply<forward>(v,d);
+      _communication.copyOwnerToAll(v,v);
+    }
+
     /*!
        \brief Clean up.
 
@@ -346,7 +353,7 @@ namespace Dune {
 
   private:
     //! \brief a sequential preconditioner
-    std::shared_ptr<Preconditioner<X,Y>> _preconditioner;
+    std::shared_ptr<P> _preconditioner;
 
     //! \brief the communication object
     const communication_type& _communication;

dune/istl/schwarz.hh

@@ -265,9 +265,9 @@ namespace Dune {
    * for approximately solving the local matrix block consisting of unknowns
    * owned by the process. Has to implement the Preconditioner interface.
    */
-  template<class X, class Y, class C, class T=Preconditioner<X,Y> >
+  template<class X, class Y, class C, class P=Preconditioner<X,Y> >
   class BlockPreconditioner : public Preconditioner<X,Y> {
-    friend struct Amg::ConstructionTraits<BlockPreconditioner<X,Y,C,T> >;
+    friend struct Amg::ConstructionTraits<BlockPreconditioner<X,Y,C,P> >;
   public:
     //! \brief The domain type of the preconditioner.
     //!
@@ -294,7 +294,7 @@ namespace Dune {
        \param c The communication object for syncing overlap and copy
        data points. (E.~g. OwnerOverlapCopyCommunication )
      */
-    BlockPreconditioner (Preconditioner<X,Y>& p, const communication_type& c)
+    BlockPreconditioner (P& p, const communication_type& c)
       : _preconditioner(stackobject_to_shared_ptr(p)), _communication(c)
     {   }
 
@@ -305,7 +305,7 @@ namespace Dune {
        \param c The communication object for syncing overlap and copy
        data points. (E.~g. OwnerOverlapCopyCommunication )
      */
-    BlockPreconditioner (const std::shared_ptr<Preconditioner<X,Y>>& p, const communication_type& c)
+    BlockPreconditioner (const std::shared_ptr<P>& p, const communication_type& c)
       : _preconditioner(p), _communication(c)
     {   }
 
@@ -356,7 +356,7 @@ namespace Dune {
 
   private:
     //! \brief a sequential preconditioner
-    std::shared_ptr<Preconditioner<X,Y>> _preconditioner;
+    std::shared_ptr<P> _preconditioner;
 
     //! \brief the communication object
     const communication_type& _communication;