From f26dc60f4e1ee7bf3735524149d66740d4823219 Mon Sep 17 00:00:00 2001 From: turcksin Date: Fri, 20 Dec 2013 16:49:16 +0000 Subject: [PATCH] Add explicit instantiations in constraint_matrix. git-svn-id: https://svn.dealii.org/branches/branch_paralution@32071 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/deal.II/lac/paralution_sparse_matrix.h | 2 +- deal.II/source/lac/constraint_matrix.cc | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/deal.II/include/deal.II/lac/paralution_sparse_matrix.h b/deal.II/include/deal.II/lac/paralution_sparse_matrix.h index ebc1e12308..6eca8f0ae2 100644 --- a/deal.II/include/deal.II/lac/paralution_sparse_matrix.h +++ b/deal.II/include/deal.II/lac/paralution_sparse_matrix.h @@ -121,7 +121,7 @@ namespace ParalutionWrappers void clear(); /** - * This function convert the underlying SparseMatrix to + * This function converts the underlying SparseMatrix to * Paralution::LocalMatrix. This function frees the SparseMatrix. */ void convert_to_paralution_csr(); diff --git a/deal.II/source/lac/constraint_matrix.cc b/deal.II/source/lac/constraint_matrix.cc index 9541a369ae..c213add373 100644 --- a/deal.II/source/lac/constraint_matrix.cc +++ b/deal.II/source/lac/constraint_matrix.cc @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -1830,6 +1831,13 @@ MATRIX_VECTOR_FUNCTIONS(TrilinosWrappers::SparseMatrix, TrilinosWrappers::MPI::V BLOCK_MATRIX_VECTOR_FUNCTIONS(TrilinosWrappers::BlockSparseMatrix, TrilinosWrappers::MPI::BlockVector); #endif +#ifdef DEAL_II_WITH_PARALUTION +MATRIX_FUNCTIONS(ParalutionWrappers::SparseMatrix); +MATRIX_FUNCTIONS(ParalutionWrappers::SparseMatrix); +MATRIX_VECTOR_FUNCTIONS(ParalutionWrappers::SparseMatrix, ParalutionWrappers::Vector); +MATRIX_VECTOR_FUNCTIONS(ParalutionWrappers::SparseMatrix, ParalutionWrappers::Vector); +#endif + #define SPARSITY_FUNCTIONS(SparsityType) \ template void ConstraintMatrix::add_entries_local_to_global (\ @@ -1899,6 +1907,11 @@ ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::SparseMatrix); ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix); #endif +#ifdef DEAL_II_WITH_PARALUTION +ONLY_MATRIX_FUNCTIONS(ParalutionWrappers::SparseMatrix); +ONLY_MATRIX_FUNCTIONS(ParalutionWrappers::SparseMatrix); +#endif + #include "constraint_matrix.inst" // allocate scratch data. Cannot use the generic template instantiation -- 2.39.5