From: Baerbel Jannsen <baerbel.janssen@gmail.com>
Date: Mon, 22 Mar 2010 14:42:21 +0000 (+0000)
Subject: modified to use distribute_local_to_global for non quadratic matrices
X-Git-Tag: v8.0.0~6284
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ec02779c69bf8364f396b51c463bcf0dc35db19;p=dealii.git

modified to use distribute_local_to_global for non quadratic matrices


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

diff --git a/deal.II/lac/source/constraint_matrix.cc b/deal.II/lac/source/constraint_matrix.cc
index c5c25bbee4..8485b6ea16 100644
--- a/deal.II/lac/source/constraint_matrix.cc
+++ b/deal.II/lac/source/constraint_matrix.cc
@@ -35,6 +35,7 @@
 #include <lac/trilinos_block_vector.h>
 #include <lac/trilinos_sparse_matrix.h>
 #include <lac/trilinos_block_sparse_matrix.h>
+#include <lac/matrix_block.h>
 
 #include <algorithm>
 #include <numeric>
@@ -2372,6 +2373,7 @@ template void ConstraintMatrix::distribute_local_to_global<SparseMatrix<float>,V
  SparseMatrix<float>             &,
  Vector<double>                  &) const;
 
+
 MATRIX_FUNCTIONS(BlockSparseMatrix<double>, BlockVector<double>);
 MATRIX_FUNCTIONS(BlockSparseMatrix<float>,  BlockVector<float>);
 template void ConstraintMatrix::distribute_local_to_global<BlockSparseMatrix<float>,BlockVector<double> >
@@ -2437,4 +2439,16 @@ SPARSITY_FUNCTIONS(TrilinosWrappers::SparsityPattern);
 SPARSITY_FUNCTIONS(TrilinosWrappers::BlockSparsityPattern);
 #endif
 
+#define ONLY_MATRIX_FUNCTIONS(MatrixType) \
+  template void ConstraintMatrix::distribute_local_to_global<MatrixType > (\
+  const FullMatrix<double>        &, \
+  const std::vector<unsigned int> &, \
+  const std::vector<unsigned int> &, \
+  MatrixType                      &) const
+
+ONLY_MATRIX_FUNCTIONS(SparseMatrix<float>);
+ONLY_MATRIX_FUNCTIONS(SparseMatrix<double>);
+ONLY_MATRIX_FUNCTIONS(MatrixBlock<SparseMatrix<float> >);
+ONLY_MATRIX_FUNCTIONS(MatrixBlock<SparseMatrix<double> >);
+
 DEAL_II_NAMESPACE_CLOSE