Jacobi added for simple vector

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

diff --git a/deal.II/lac/include/lac/block_sparse_matrix.h b/deal.II/lac/include/lac/block_sparse_matrix.h
index 5abf9e557553bb2b6e1047f8eea51774ddee1cb2..a4d9869d8bdfe6ddbb1604072ae4786959034670 100644 (file)
--- a/deal.II/lac/include/lac/block_sparse_matrix.h
+++ b/deal.II/lac/include/lac/block_sparse_matrix.h
@@ -224,6 +224,18 @@ class BlockSparseMatrix : public BlockMatrixBase<SparseMatrix<number> >
     template <class BlockVectorType>
     void precondition_Jacobi (BlockVectorType       &dst,
                              const BlockVectorType &src,
+                             const number           omega = 1.) const;
+
+                                    /**
+                                     * Apply the Jacobi
+                                     * preconditioner to a simple vector.
+                                     *
+                                     * The matrix must be a single
+                                     * square block for this.
+                                   */
+    template <typename number2>
+    void precondition_Jacobi (Vector<number2>       &dst,
+                             const Vector<number2> &src,
                              const number           omega = 1.) const;
 
                                     /**
@@ -346,4 +358,19 @@ precondition_Jacobi (BlockVectorType       &dst,
 }
 
 
+template <typename number>
+template <typename number2>
+void
+BlockSparseMatrix<number>::
+precondition_Jacobi (Vector<number2>       &dst,
+                    const Vector<number2> &src,
+                    const number           omega) const
+{
+//TODO: Insert assertions
+                                   // do a diagonal preconditioning. uses only
+                                   // the diagonal blocks of the matrix
+  this->block(0,0).precondition_Jacobi (dst, src, omega);
+}
+
+
 #endif    // __deal2__block_sparse_matrix_h