From 1d7f4178445be83add69a4c0e3a5e243ea6ebf4f Mon Sep 17 00:00:00 2001
From: kronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 19 Dec 2012 11:07:02 +0000
Subject: [PATCH] Use generic instantiation procedure for selecting vectors in
 solution transfer.

git-svn-id: https://svn.dealii.org/trunk@27826 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/source/numerics/solution_transfer.cc  |  2 +
 .../source/numerics/solution_transfer.inst.in | 38 ++-----------------
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/deal.II/source/numerics/solution_transfer.cc b/deal.II/source/numerics/solution_transfer.cc
index b96cab0b4d..a36bb8ab1a 100644
--- a/deal.II/source/numerics/solution_transfer.cc
+++ b/deal.II/source/numerics/solution_transfer.cc
@@ -20,9 +20,11 @@
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/fe/fe.h>
 #include <deal.II/lac/vector.h>
+#include <deal.II/lac/parallel_vector.h>
 #include <deal.II/lac/petsc_vector.h>
 #include <deal.II/lac/trilinos_vector.h>
 #include <deal.II/lac/block_vector.h>
+#include <deal.II/lac/parallel_block_vector.h>
 #include <deal.II/lac/petsc_block_vector.h>
 #include <deal.II/lac/trilinos_block_vector.h>
 #include <deal.II/numerics/solution_transfer.h>
diff --git a/deal.II/source/numerics/solution_transfer.inst.in b/deal.II/source/numerics/solution_transfer.inst.in
index e50bb475ea..10bd981e4f 100644
--- a/deal.II/source/numerics/solution_transfer.inst.in
+++ b/deal.II/source/numerics/solution_transfer.inst.in
@@ -11,42 +11,10 @@
 //
 //---------------------------------------------------------------------------
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
+for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
-
-    template class SolutionTransfer<deal_II_dimension, Vector<float>, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, Vector<double>, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, Vector<float>, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, Vector<double>, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-
-    template class SolutionTransfer<deal_II_dimension, BlockVector<float>, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, BlockVector<double>, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, BlockVector<float>, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, BlockVector<double>, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-
-
-#ifdef DEAL_II_USE_PETSC
-    template class SolutionTransfer<deal_II_dimension, PETScWrappers::Vector, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, PETScWrappers::Vector, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-
-    template class SolutionTransfer<deal_II_dimension, PETScWrappers::BlockVector, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, PETScWrappers::BlockVector, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-#endif
-
-#ifdef DEAL_II_USE_TRILINOS
-    template class SolutionTransfer<deal_II_dimension, TrilinosWrappers::Vector, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, TrilinosWrappers::Vector, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-
-    template class SolutionTransfer<deal_II_dimension, TrilinosWrappers::BlockVector, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, TrilinosWrappers::BlockVector, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-
-    template class SolutionTransfer<deal_II_dimension, TrilinosWrappers::MPI::Vector, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, TrilinosWrappers::MPI::Vector, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-
-    template class SolutionTransfer<deal_II_dimension, TrilinosWrappers::MPI::BlockVector, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-    template class SolutionTransfer<deal_II_dimension, TrilinosWrappers::MPI::BlockVector, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
-#endif
-
+    template class SolutionTransfer<deal_II_dimension, VEC, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
+    template class SolutionTransfer<deal_II_dimension, VEC, hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
 #endif
 }
-- 
2.39.5