Use the generic instantiation scheme instead of manually listing the desired vector...

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

diff --git a/deal.II/source/numerics/derivative_approximation.cc b/deal.II/source/numerics/derivative_approximation.cc
index 66fb66d83079bdcf547232610c79e68bb989f5fd..59929690ba270709443455f511ceae5957737544 100644 (file)
--- a/deal.II/source/numerics/derivative_approximation.cc
+++ b/deal.II/source/numerics/derivative_approximation.cc
@@ -17,6 +17,8 @@
 #include <deal.II/base/multithread_info.h>
 #include <deal.II/lac/vector.h>
 #include <deal.II/lac/block_vector.h>
+#include <deal.II/lac/parallel_vector.h>
+#include <deal.II/lac/parallel_block_vector.h>
 #include <deal.II/lac/petsc_vector.h>
 #include <deal.II/lac/petsc_block_vector.h>
 #include <deal.II/lac/trilinos_vector.h>

diff --git a/deal.II/source/numerics/derivative_approximation.inst.in b/deal.II/source/numerics/derivative_approximation.inst.in
index 39dcf371240850f230adce89349adeb302707cbb..8abdb2bde792c80b3554d9ce435262b644e85c04 100644 (file)
--- a/deal.II/source/numerics/derivative_approximation.inst.in
+++ b/deal.II/source/numerics/derivative_approximation.inst.in
@@ -11,140 +11,114 @@
 //
 //---------------------------------------------------------------------------
 
-for (deal_II_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS ; VEC : SERIAL_VECTORS ; DH : DOFHANDLER_TEMPLATES)
 {
-#define INSTANTIATE(InputVector,DH)                      \
-template                                                 \
-void                                                     \
-DerivativeApproximation::                                \
-approximate_gradient<deal_II_dimension>                  \
-(const Mapping<deal_II_dimension> &mapping,              \
- const DH<deal_II_dimension> &dof_handler,               \
- const InputVector  &solution,                           \
- Vector<float>         &derivative_norm,                 \
- const unsigned int     component);                      \
-                                                         \
-template                                                 \
-void                                                     \
-DerivativeApproximation::                                \
-approximate_gradient<deal_II_dimension>                  \
-(const DH<deal_II_dimension> &dof_handler,               \
- const InputVector     &solution,                        \
- Vector<float>         &derivative_norm,                 \
- const unsigned int     component);                      \
-                                                         \
-template                                                 \
-void                                                     \
-DerivativeApproximation::                                \
-approximate_second_derivative<deal_II_dimension>         \
-(const Mapping<deal_II_dimension> &mapping,              \
- const DH<deal_II_dimension> &dof_handler,               \
- const InputVector  &solution,                           \
- Vector<float>         &derivative_norm,                 \
- const unsigned int     component);                      \
-                                                         \
-template                                                 \
-void                                                     \
-DerivativeApproximation::                                \
-approximate_second_derivative<deal_II_dimension>         \
-(const DH<deal_II_dimension> &dof_handler,               \
- const InputVector     &solution,                        \
- Vector<float>         &derivative_norm,                 \
- const unsigned int     component);                      \
-                                                         \
-template                                                 \
-void                                                     \
-DerivativeApproximation::                                \
-approximate_derivative_tensor<deal_II_dimension>         \
-(const Mapping<deal_II_dimension> &    mapping,         \
- const DH<deal_II_dimension> &dof_handler,               \
- const InputVector     &solution,                        \
- const DH<deal_II_dimension>::active_cell_iterator &cell,\
- Tensor<1,deal_II_dimension> &derivative,                \
- const unsigned int     component);                      \
-                                                         \
-template                                                 \
-void                                                     \
-DerivativeApproximation::                                \
-approximate_derivative_tensor<deal_II_dimension>         \
-(const Mapping<deal_II_dimension> &    mapping,         \
- const DH<deal_II_dimension> &dof_handler,               \
- const InputVector     &solution,                        \
- const DH<deal_II_dimension>::active_cell_iterator &cell,\
- Tensor<2,deal_II_dimension> &derivative,                \
- const unsigned int     component);                      \
-                                                         \
-template                                                 \
-void                                                     \
-DerivativeApproximation::                                \
-approximate_derivative_tensor<deal_II_dimension>         \
-(const Mapping<deal_II_dimension> &    mapping,         \
- const DH<deal_II_dimension> &dof_handler,               \
- const InputVector     &solution,                        \
- const DH<deal_II_dimension>::active_cell_iterator &cell,\
- Tensor<3,deal_II_dimension> &derivative,                \
- const unsigned int     component);                     \
-                                                        \
-template                                                 \
-void                                                     \
-DerivativeApproximation::                                \
-approximate_derivative_tensor<deal_II_dimension>         \
-(const DH<deal_II_dimension> &dof_handler,               \
- const InputVector     &solution,                        \
- const DH<deal_II_dimension>::active_cell_iterator &cell,\
- Tensor<1,deal_II_dimension> &derivative,                \
- const unsigned int     component);                      \
-                                                         \
-template                                                 \
-void                                                     \
-DerivativeApproximation::                                \
-approximate_derivative_tensor<deal_II_dimension>         \
-(const DH<deal_II_dimension> &dof_handler,               \
- const InputVector     &solution,                        \
- const DH<deal_II_dimension>::active_cell_iterator &cell,\
- Tensor<2,deal_II_dimension> &derivative,                \
- const unsigned int     component);                      \
-                                                         \
-template                                                 \
-void                                                     \
-DerivativeApproximation::                                \
-approximate_derivative_tensor<deal_II_dimension>         \
-(const DH<deal_II_dimension> &dof_handler,               \
- const InputVector     &solution,                        \
- const DH<deal_II_dimension>::active_cell_iterator &cell,\
- Tensor<3,deal_II_dimension> &derivative,                \
- const unsigned int     component)
-
-
-INSTANTIATE(Vector<double>, DoFHandler);
-INSTANTIATE(Vector<float>, DoFHandler);
-INSTANTIATE(BlockVector<double>, DoFHandler);
-INSTANTIATE(BlockVector<float>, DoFHandler);
-
-INSTANTIATE(Vector<double>, hp::DoFHandler);
-INSTANTIATE(Vector<float>, hp::DoFHandler);
-INSTANTIATE(BlockVector<double>, hp::DoFHandler);
-INSTANTIATE(BlockVector<float>, hp::DoFHandler);
-
-#ifdef DEAL_II_WITH_PETSC
-INSTANTIATE(PETScWrappers::Vector, DoFHandler);
-INSTANTIATE(PETScWrappers::BlockVector, DoFHandler);
-
-INSTANTIATE(PETScWrappers::Vector, hp::DoFHandler);
-INSTANTIATE(PETScWrappers::BlockVector, hp::DoFHandler);
-#endif
-
-#ifdef DEAL_II_WITH_TRILINOS
-INSTANTIATE(TrilinosWrappers::Vector, DoFHandler);
-INSTANTIATE(TrilinosWrappers::BlockVector, DoFHandler);
-INSTANTIATE(TrilinosWrappers::MPI::Vector, DoFHandler);
-INSTANTIATE(TrilinosWrappers::MPI::BlockVector, DoFHandler);
-
-//TODO: test hp before instantiating
-#endif
-
-#undef INSTANTIATE
+template
+void
+DerivativeApproximation::
+approximate_gradient<deal_II_dimension>
+(const Mapping<deal_II_dimension> &mapping,
+ const DH<deal_II_dimension> &dof_handler,
+ const VEC             &solution,
+ Vector<float>         &derivative_norm,
+ const unsigned int     component);
+
+template
+void
+DerivativeApproximation::
+approximate_gradient<deal_II_dimension>
+(const DH<deal_II_dimension> &dof_handler,
+ const VEC             &solution,
+ Vector<float>         &derivative_norm,
+ const unsigned int     component);
+
+template
+void
+DerivativeApproximation::
+approximate_second_derivative<deal_II_dimension>
+(const Mapping<deal_II_dimension> &mapping,
+ const DH<deal_II_dimension> &dof_handler,
+ const VEC             &solution,
+ Vector<float>         &derivative_norm,
+ const unsigned int     component);
+
+template
+void
+DerivativeApproximation::
+approximate_second_derivative<deal_II_dimension>
+(const DH<deal_II_dimension> &dof_handler,
+ const VEC             &solution,
+ Vector<float>         &derivative_norm,
+ const unsigned int     component);
+
+template
+void
+DerivativeApproximation::
+approximate_derivative_tensor<deal_II_dimension>
+(const Mapping<deal_II_dimension> &    mapping,
+ const DH<deal_II_dimension> &dof_handler,
+ const VEC &solution,
+ const DH<deal_II_dimension>::active_cell_iterator &cell,
+ Tensor<1,deal_II_dimension> &derivative,
+ const unsigned int     component);
+
+template
+void
+DerivativeApproximation::
+approximate_derivative_tensor<deal_II_dimension>
+(const Mapping<deal_II_dimension> &    mapping,
+ const DH<deal_II_dimension> &dof_handler,
+ const VEC &solution,
+ const DH<deal_II_dimension>::active_cell_iterator &cell,
+ Tensor<2,deal_II_dimension> &derivative,
+ const unsigned int     component);
 
+template
+void
+DerivativeApproximation::
+approximate_derivative_tensor<deal_II_dimension>
+(const Mapping<deal_II_dimension> &    mapping,
+ const DH<deal_II_dimension> &dof_handler,
+ const VEC &solution,
+ const DH<deal_II_dimension>::active_cell_iterator &cell,
+ Tensor<3,deal_II_dimension> &derivative,
+ const unsigned int     component);
+
+template
+void
+DerivativeApproximation::
+approximate_derivative_tensor<deal_II_dimension>
+(const DH<deal_II_dimension> &dof_handler,
+ const VEC &solution,
+ const DH<deal_II_dimension>::active_cell_iterator &cell,
+ Tensor<1,deal_II_dimension> &derivative,
+ const unsigned int     component);
+
+template
+void
+DerivativeApproximation::
+approximate_derivative_tensor<deal_II_dimension>
+(const DH<deal_II_dimension> &dof_handler,
+ const VEC &solution,
+ const DH<deal_II_dimension>::active_cell_iterator &cell,
+ Tensor<2,deal_II_dimension> &derivative,
+ const unsigned int     component);
+
+template
+void
+DerivativeApproximation::
+approximate_derivative_tensor<deal_II_dimension>
+(const DH<deal_II_dimension> &dof_handler,
+ const VEC &solution,
+ const DH<deal_II_dimension>::active_cell_iterator &cell,
+ Tensor<3,deal_II_dimension> &derivative,
+ const unsigned int     component);
+
+}
+
+
+for (deal_II_dimension : DIMENSIONS)
+{
 template
 double
 DerivativeApproximation::

diff --git a/deal.II/source/numerics/error_estimator.inst.in b/deal.II/source/numerics/error_estimator.inst.in
index 1b84c651f1faec344915fcb24c0f379741822258..7b701a69924e1ef249c678f8c55d5ba676356525 100644 (file)
--- a/deal.II/source/numerics/error_estimator.inst.in
+++ b/deal.II/source/numerics/error_estimator.inst.in
@@ -11,200 +11,136 @@
 //
 //---------------------------------------------------------------------------
 
-for (deal_II_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS ; deal_II_space_dimension : SPACE_DIMENSIONS)
 {
-#if deal_II_dimension != 1
-template class KellyErrorEstimator<deal_II_dimension, deal_II_dimension>;
+#if deal_II_dimension != 1 && deal_II_dimension <= deal_II_space_dimension
+template class KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>;
 #endif
+}
 
+for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; DH : DOFHANDLER_TEMPLATES )
+{
+#if deal_II_dimension <= deal_II_space_dimension
+
+template
+void
+KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::
+estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
+          const DH<deal_II_dimension,deal_II_space_dimension>   &,
+          const Quadrature<deal_II_dimension-1> &,
+          const FunctionMap<deal_II_space_dimension>::type &,
+          const VEC       &,
+          Vector<float>           &,
+          const ComponentMask &,
+          const Function<deal_II_space_dimension>     *,
+          const unsigned int       ,
+          const unsigned int       ,
+          const types::material_id);
+
+template
+void
+KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::
+estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
+          const DH<deal_II_dimension,deal_II_space_dimension>   &,
+          const Quadrature<deal_II_dimension-1> &,
+          const FunctionMap<deal_II_space_dimension>::type &,
+          const VEC       &,
+          Vector<float>           &,
+          const ComponentMask &,
+          const Function<deal_II_space_dimension>     *,
+          const unsigned int       ,
+          const unsigned int       ,
+          const types::material_id);
+
+template
+void
+KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::
+estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
+          const DH<deal_II_dimension,deal_II_space_dimension>   &,
+          const Quadrature<deal_II_dimension-1> &,
+          const FunctionMap<deal_II_space_dimension>::type &,
+          const std::vector<const VEC *>       &,
+          std::vector<Vector<float> *>         &,
+          const ComponentMask &,
+          const Function<deal_II_space_dimension>     *,
+          const unsigned int       ,
+          const unsigned int       ,
+          const types::material_id);
+
+template
+void
+KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::
+estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
+          const DH<deal_II_dimension,deal_II_space_dimension>   &,
+          const Quadrature<deal_II_dimension-1> &,
+          const FunctionMap<deal_II_space_dimension>::type &,
+          const std::vector<const VEC *>       &,
+          std::vector<Vector<float> *>         &,
+          const ComponentMask &,
+          const Function<deal_II_space_dimension>     *,
+          const unsigned int       ,
+          const unsigned int       ,
+          const types::material_id);
+
+template
+void
+KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::
+estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
+          const DH<deal_II_dimension,deal_II_space_dimension>   &,
+          const hp::QCollection<deal_II_dimension-1> &,
+          const FunctionMap<deal_II_space_dimension>::type &,
+          const VEC       &,
+          Vector<float>           &,
+          const ComponentMask &,
+          const Function<deal_II_space_dimension>     *,
+          const unsigned int       ,
+          const unsigned int       ,
+          const types::material_id);
+
+template
+void
+KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::
+estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
+          const DH<deal_II_dimension,deal_II_space_dimension>   &,
+          const hp::QCollection<deal_II_dimension-1> &,
+          const FunctionMap<deal_II_space_dimension>::type &,
+          const VEC       &,
+          Vector<float>           &,
+          const ComponentMask &,
+          const Function<deal_II_space_dimension>     *,
+          const unsigned int       ,
+          const unsigned int       ,
+          const types::material_id);
+
+template
+void
+KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::
+estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
+          const DH<deal_II_dimension,deal_II_space_dimension>   &,
+          const hp::QCollection<deal_II_dimension-1> &,
+          const FunctionMap<deal_II_space_dimension>::type &,
+          const std::vector<const VEC *>       &,
+          std::vector<Vector<float> *>         &,
+          const ComponentMask &,
+          const Function<deal_II_space_dimension>     *,
+          const unsigned int       ,
+          const unsigned int       ,
+          const types::material_id);
+
+template
+void
+KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::
+estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
+          const DH<deal_II_dimension,deal_II_space_dimension>   &,
+          const hp::QCollection<deal_II_dimension-1> &,
+          const FunctionMap<deal_II_space_dimension>::type &,
+          const std::vector<const VEC *>       &,
+          std::vector<Vector<float> *>         &,
+          const ComponentMask &,
+          const Function<deal_II_space_dimension>     *,
+          const unsigned int       ,
+          const unsigned int       ,
+          const types::material_id);
 
-#if deal_II_dimension == 2
-template class KellyErrorEstimator<deal_II_dimension, deal_II_dimension+1>;
-#endif
-
-// instantiate the externally visible functions. define a list of functions
-// for vectors, where the vector/matrix can be replaced using a preprocessor
-// variable VectorType/MatrixType
-#define INSTANTIATE_1(InputVector,DH,Q) \
-template    \
-void    \
-KellyErrorEstimator<deal_II_dimension, deal_II_dimension>::    \
-estimate<InputVector,DH<deal_II_dimension> > (const Mapping<deal_II_dimension, deal_II_dimension>      &,    \
-          const DH<deal_II_dimension>   &,    \
-          const Q<deal_II_dimension-1> &,    \
-          const FunctionMap<deal_II_dimension>::type &,    \
-          const InputVector       &,    \
-          Vector<float>           &,    \
-          const ComponentMask &,    \
-          const Function<deal_II_dimension>     *,    \
-          const unsigned int       , \
-          const unsigned int       , \
-          const types::material_id);    \
-    \
-template    \
-void    \
-KellyErrorEstimator<deal_II_dimension, deal_II_dimension>::    \
-estimate<InputVector,DH<deal_II_dimension> > (const DH<deal_II_dimension>   &,    \
-          const Q<deal_II_dimension-1> &,    \
-          const FunctionMap<deal_II_dimension>::type &,    \
-          const InputVector       &,    \
-          Vector<float>           &,    \
-          const ComponentMask &,    \
-          const Function<deal_II_dimension>     *,    \
-          const unsigned int       , \
-          const unsigned int       , \
-          const types::material_id);    \
-        \
-template    \
-void    \
-KellyErrorEstimator<deal_II_dimension, deal_II_dimension>::    \
-estimate<InputVector,DH<deal_II_dimension> > (const Mapping<deal_II_dimension, deal_II_dimension>          &,    \
-          const DH<deal_II_dimension>       &,    \
-          const Q<deal_II_dimension-1>     &,    \
-          const FunctionMap<deal_II_dimension>::type &,    \
-          const std::vector<const InputVector *> &,    \
-          std::vector<Vector<float>*> &,    \
-          const ComponentMask     &,    \
-          const Function<deal_II_dimension>         *,    \
-          const unsigned int           , \
-          const unsigned int           , \
-          const types::material_id);    \
-    \
-template    \
-void    \
-KellyErrorEstimator<deal_II_dimension, deal_II_dimension>::    \
-estimate<InputVector,DH<deal_II_dimension> > (const DH<deal_II_dimension>       &,    \
-          const Q<deal_II_dimension-1>     &,    \
-          const FunctionMap<deal_II_dimension>::type &,    \
-          const std::vector<const InputVector *> &,    \
-          std::vector<Vector<float>*> &,    \
-          const ComponentMask     &,    \
-          const Function<deal_II_dimension>         *,    \
-          const unsigned int           , \
-          const unsigned int           , \
-          const types::material_id);\
-
-#if deal_II_dimension == 2 || deal_II_dimension == 1
-
-#define INSTANTIATE_CODIM(InputVector,DH,Q)     \
-template    \
-void    \
-KellyErrorEstimator<deal_II_dimension, deal_II_dimension+1>::    \
-estimate<InputVector,DH<deal_II_dimension,deal_II_dimension+1> > (const Mapping<deal_II_dimension, deal_II_dimension+1>      &,    \
-          const DH<deal_II_dimension,deal_II_dimension+1>   &,    \
-          const Q<deal_II_dimension-1> &,    \
-          const FunctionMap<deal_II_dimension+1>::type &,    \
-          const InputVector       &,    \
-          Vector<float>           &,    \
-          const ComponentMask &,    \
-          const Function<deal_II_dimension+1>     *,    \
-          const unsigned int       , \
-          const unsigned int       , \
-          const types::material_id);    \
-    \
-template    \
-void    \
-KellyErrorEstimator<deal_II_dimension, deal_II_dimension+1>::    \
-estimate<InputVector,DH<deal_II_dimension,deal_II_dimension+1> > (const DH<deal_II_dimension,deal_II_dimension+1>   &,    \
-          const Q<deal_II_dimension-1> &,    \
-          const FunctionMap<deal_II_dimension+1>::type &,    \
-          const InputVector       &,    \
-          Vector<float>           &,    \
-          const ComponentMask &,    \
-          const Function<deal_II_dimension+1>     *,    \
-          const unsigned int       , \
-          const unsigned int       , \
-          const types::material_id);    \
-        \
-template    \
-void    \
-KellyErrorEstimator<deal_II_dimension, deal_II_dimension+1>::    \
-estimate<InputVector,DH<deal_II_dimension,deal_II_dimension+1> > (const Mapping<deal_II_dimension, deal_II_dimension+1>          &,    \
-          const DH<deal_II_dimension,deal_II_dimension+1>       &,    \
-          const Q<deal_II_dimension-1>     &,    \
-          const FunctionMap<deal_II_dimension+1>::type &,    \
-          const std::vector<const InputVector *> &,    \
-          std::vector<Vector<float>*> &,    \
-          const ComponentMask     &,    \
-          const Function<deal_II_dimension+1>         *,    \
-          const unsigned int           , \
-          const unsigned int           , \
-          const types::material_id);    \
-    \
-template    \
-void    \
-KellyErrorEstimator<deal_II_dimension, deal_II_dimension+1>::    \
-estimate<InputVector,DH<deal_II_dimension,deal_II_dimension+1> > (const DH<deal_II_dimension,deal_II_dimension+1>       &,    \
-          const Q<deal_II_dimension-1>     &,    \
-          const FunctionMap<deal_II_dimension+1>::type &,    \
-          const std::vector<const InputVector *> &,    \
-          std::vector<Vector<float>*> &,    \
-          const ComponentMask     &,    \
-          const Function<deal_II_dimension+1>         *,    \
-          const unsigned int           , \
-          const unsigned int           , \
-          const types::material_id);\
-
-#else
-#define INSTANTIATE_CODIM(InputVector,DH,Q)
-#endif
-
-
-#define INSTANTIATE(InputVector,DH) \
-     INSTANTIATE_1(InputVector,DH,Quadrature) \
-     INSTANTIATE_1(InputVector,DH,hp::QCollection) \
-     INSTANTIATE_CODIM(InputVector, DH, Quadrature) \
-     INSTANTIATE_CODIM(InputVector, DH, hp::QCollection)
-
-
-
-INSTANTIATE(Vector<double>,DoFHandler)
-INSTANTIATE(Vector<float>,DoFHandler)
-INSTANTIATE(BlockVector<double>,DoFHandler)
-INSTANTIATE(BlockVector<float>,DoFHandler)
-
-INSTANTIATE(Vector<double>,hp::DoFHandler)
-INSTANTIATE(Vector<float>,hp::DoFHandler)
-INSTANTIATE(BlockVector<double>,hp::DoFHandler)
-INSTANTIATE(BlockVector<float>,hp::DoFHandler)
-
-INSTANTIATE(parallel::distributed::Vector<double>,DoFHandler)
-INSTANTIATE(parallel::distributed::Vector<float>,DoFHandler)
-INSTANTIATE(parallel::distributed::BlockVector<double>,DoFHandler)
-INSTANTIATE(parallel::distributed::BlockVector<float>,DoFHandler)
-
-INSTANTIATE(parallel::distributed::Vector<double>,hp::DoFHandler)
-INSTANTIATE(parallel::distributed::Vector<float>,hp::DoFHandler)
-INSTANTIATE(parallel::distributed::BlockVector<double>,hp::DoFHandler)
-INSTANTIATE(parallel::distributed::BlockVector<float>,hp::DoFHandler)
-
-#ifdef DEAL_II_WITH_PETSC
-INSTANTIATE(PETScWrappers::Vector,DoFHandler)
-INSTANTIATE(PETScWrappers::BlockVector,DoFHandler)
-
-INSTANTIATE(PETScWrappers::Vector,hp::DoFHandler)
-INSTANTIATE(PETScWrappers::BlockVector,hp::DoFHandler)
-
-INSTANTIATE(PETScWrappers::MPI::Vector,DoFHandler)
-INSTANTIATE(PETScWrappers::MPI::BlockVector,DoFHandler)
-
-#endif
-
-#ifdef DEAL_II_WITH_TRILINOS
-INSTANTIATE(TrilinosWrappers::Vector,DoFHandler)
-INSTANTIATE(TrilinosWrappers::BlockVector,DoFHandler)
-
-INSTANTIATE(TrilinosWrappers::Vector,hp::DoFHandler)
-INSTANTIATE(TrilinosWrappers::BlockVector,hp::DoFHandler)
-
-INSTANTIATE(TrilinosWrappers::MPI::Vector,DoFHandler)
-INSTANTIATE(TrilinosWrappers::MPI::BlockVector,DoFHandler)
-
-INSTANTIATE(TrilinosWrappers::MPI::Vector,hp::DoFHandler)
-INSTANTIATE(TrilinosWrappers::MPI::BlockVector,hp::DoFHandler)
 #endif
-
-#undef INSTANTIATE
-#undef INSTANTIATE_1
-#undef INSTANTIATE_CODIM
 }