From: janssen Date: Mon, 22 Mar 2010 14:42:21 +0000 (+0000) Subject: modified to use distribute_local_to_global for non quadratic matrices X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eae2efcd33cfc3e3538af5cdde776c100b6023b3;p=dealii-svn.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 #include #include +#include #include #include @@ -2372,6 +2373,7 @@ template void ConstraintMatrix::distribute_local_to_global,V SparseMatrix &, Vector &) const; + MATRIX_FUNCTIONS(BlockSparseMatrix, BlockVector); MATRIX_FUNCTIONS(BlockSparseMatrix, BlockVector); template void ConstraintMatrix::distribute_local_to_global,BlockVector > @@ -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 (\ + const FullMatrix &, \ + const std::vector &, \ + const std::vector &, \ + MatrixType &) const + +ONLY_MATRIX_FUNCTIONS(SparseMatrix); +ONLY_MATRIX_FUNCTIONS(SparseMatrix); +ONLY_MATRIX_FUNCTIONS(MatrixBlock >); +ONLY_MATRIX_FUNCTIONS(MatrixBlock >); + DEAL_II_NAMESPACE_CLOSE