From 86f6fb7daa84e8e853fe1d04a543695405ee31ba Mon Sep 17 00:00:00 2001 From: kanschat Date: Sat, 25 May 2013 21:13:30 +0000 Subject: [PATCH] add dummy compress function to SparseMatrix git-svn-id: https://svn.dealii.org/trunk@29602 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/lac/sparse_matrix.h | 11 +++++++++-- deal.II/include/deal.II/lac/sparse_matrix.templates.h | 5 +++++ deal.II/source/multigrid/mg_transfer_prebuilt.cc | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) 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 #include #include +// Included for VectorOperation +#include DEAL_II_NAMESPACE_OPEN @@ -27,7 +29,6 @@ template class FullMatrix; template class BlockMatrixBase; template class SparseILU; - #ifdef DEAL_II_WITH_TRILINOS namespace TrilinosWrappers { @@ -470,8 +471,9 @@ namespace SparseMatrixIterators * @; 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 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::block_read (std::istream &in) } +template +void +SparseMatrix::compress (::dealii::VectorOperation::values) +{} + template 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::build_matrices ( true); } } + prolongation_matrices[level]->compress(VectorOperation::insert); } -- 2.39.5