From: kanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Sat, 25 May 2013 21:13:30 +0000 (+0000)
Subject: add dummy compress function to SparseMatrix
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86f6fb7daa84e8e853fe1d04a543695405ee31ba;p=dealii-svn.git

add dummy compress function to SparseMatrix

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

diff --git a/deal.II/include/deal.II/lac/sparse_matrix.h b/deal.II/include/deal.II/lac/sparse_matrix.h
index 1eacd52948..e9b2bdffb5 100644
--- a/deal.II/include/deal.II/lac/sparse_matrix.h
+++ b/deal.II/include/deal.II/lac/sparse_matrix.h
@@ -19,6 +19,8 @@
 #include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/identity_matrix.h>
 #include <deal.II/lac/exceptions.h>
+// Included for VectorOperation
+#include <deal.II/lac/vector.h>
 
 DEAL_II_NAMESPACE_OPEN
 
@@ -27,7 +29,6 @@ template <typename number> class FullMatrix;
 template <typename Matrix> class BlockMatrixBase;
 template <typename number> class SparseILU;
 
-
 #ifdef DEAL_II_WITH_TRILINOS
 namespace TrilinosWrappers
 {
@@ -470,8 +471,9 @@ namespace SparseMatrixIterators
  * @<double@></tt>; others can be generated in application programs (see the
  * section on @ref Instantiations in the manual).
  *
+ * @ingroup Matrix1
  * @author Essentially everyone who has ever worked on deal.II
- * @date 1994-2010
+ * @date 1994-2013
  */
 template <typename number>
 class SparseMatrix : public virtual Subscriptor
@@ -696,6 +698,11 @@ public:
    * object. See MemoryConsumption.
    */
   std::size_t memory_consumption () const;
+  
+  /**
+   * Dummy function for compatibility with distributed, parallel matrices.
+   */
+  void compress (::dealii::VectorOperation::values);
 
 //@}
   /**
diff --git a/deal.II/include/deal.II/lac/sparse_matrix.templates.h b/deal.II/include/deal.II/lac/sparse_matrix.templates.h
index ce97bbcaee..af84fa9a5e 100644
--- a/deal.II/include/deal.II/lac/sparse_matrix.templates.h
+++ b/deal.II/include/deal.II/lac/sparse_matrix.templates.h
@@ -1931,6 +1931,11 @@ SparseMatrix<number>::block_read (std::istream &in)
 }
 
 
+template <typename number>
+void
+SparseMatrix<number>::compress (::dealii::VectorOperation::values)
+{}
+
 
 template <typename number>
 std::size_t
diff --git a/deal.II/source/multigrid/mg_transfer_prebuilt.cc b/deal.II/source/multigrid/mg_transfer_prebuilt.cc
index 2d687da908..17f69b5864 100644
--- a/deal.II/source/multigrid/mg_transfer_prebuilt.cc
+++ b/deal.II/source/multigrid/mg_transfer_prebuilt.cc
@@ -227,6 +227,7 @@ void MGTransferPrebuilt<VECTOR>::build_matrices (
                                                      true);
               }
           }
+      prolongation_matrices[level]->compress(VectorOperation::insert);
     }