From: turcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 20 Dec 2013 16:49:16 +0000 (+0000)
Subject: Add explicit instantiations in constraint_matrix.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f26dc60f4e1ee7bf3735524149d66740d4823219;p=dealii-svn.git

Add explicit instantiations in constraint_matrix.

git-svn-id: https://svn.dealii.org/branches/branch_paralution@32071 0785d39b-7218-0410-832d-ea1e28bc413d
---

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 <deal.II/lac/trilinos_block_sparse_matrix.h>
 #include <deal.II/lac/matrix_block.h>
 #include <deal.II/lac/paralution_vector.h>
+#include <deal.II/lac/paralution_sparse_matrix.h>
 
 #include <algorithm>
 #include <numeric>
@@ -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<float>);
+MATRIX_FUNCTIONS(ParalutionWrappers::SparseMatrix<double>);
+MATRIX_VECTOR_FUNCTIONS(ParalutionWrappers::SparseMatrix<float>, ParalutionWrappers::Vector<float>);
+MATRIX_VECTOR_FUNCTIONS(ParalutionWrappers::SparseMatrix<double>, ParalutionWrappers::Vector<double>);
+#endif
+
 
 #define SPARSITY_FUNCTIONS(SparsityType) \
   template void ConstraintMatrix::add_entries_local_to_global<SparsityType> (\
@@ -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<float>);
+ONLY_MATRIX_FUNCTIONS(ParalutionWrappers::SparseMatrix<double>);
+#endif
+
 #include "constraint_matrix.inst"
 
 // allocate scratch data. Cannot use the generic template instantiation