Systematize instantiations for MappingQEulerian and MappingQ1Eulerian.

diff --git a/source/fe/mapping_q1_eulerian.cc b/source/fe/mapping_q1_eulerian.cc
index 0b132b8baf0f7e5f4298b1f732f4d9219140ddaf..a17a9ba87f8d8a232145b685c8c3290bb6908b9d 100644 (file)
--- a/source/fe/mapping_q1_eulerian.cc
+++ b/source/fe/mapping_q1_eulerian.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2015 by the deal.II authors
+// Copyright (C) 2001 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -16,7 +16,11 @@
 #include <deal.II/base/std_cxx11/array.h>
 #include <deal.II/fe/mapping_q1_eulerian.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>
 #include <deal.II/lac/trilinos_block_vector.h>
 #include <deal.II/lac/trilinos_parallel_block_vector.h>

diff --git a/source/fe/mapping_q1_eulerian.inst.in b/source/fe/mapping_q1_eulerian.inst.in
index b8b860f5b2bcc0e4e6a0bb5bcc9d27e4488b233f..f07fa43b8000ef3efd0441614e69a90794169f87 100644 (file)
--- a/source/fe/mapping_q1_eulerian.inst.in
+++ b/source/fe/mapping_q1_eulerian.inst.in
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 1998 - 2015 by the deal.II authors
+// Copyright (C) 1998 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -14,29 +14,11 @@
 // ---------------------------------------------------------------------
 
 
-
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : REAL_SERIAL_VECTORS)
   {
 #if deal_II_dimension <= deal_II_space_dimension       
-    template class MappingQ1Eulerian<deal_II_dimension, Vector<double>,        deal_II_space_dimension>;
-    template class MappingQ1Eulerian<deal_II_dimension, Vector<float>, deal_II_space_dimension>;
-#  ifdef DEAL_II_WITH_PETSC
-#  ifndef PETSC_USE_COMPLEX 
-    template class MappingQ1Eulerian<deal_II_dimension,
-                                   PETScWrappers::Vector, deal_II_space_dimension>;
-    template class MappingQ1Eulerian<deal_II_dimension,
-                                   PETScWrappers::MPI::Vector, deal_II_space_dimension>;
-#  endif
-#  endif   
-#  ifdef DEAL_II_WITH_TRILINOS
-    template class MappingQ1Eulerian<deal_II_dimension,
-                                    TrilinosWrappers::Vector, deal_II_space_dimension>;
-    template class MappingQ1Eulerian<deal_II_dimension,
-                                    TrilinosWrappers::MPI::Vector, deal_II_space_dimension>;
-    template class MappingQ1Eulerian<deal_II_dimension,
-                                    TrilinosWrappers::BlockVector, deal_II_space_dimension>;
-    template class MappingQ1Eulerian<deal_II_dimension,
-                                    TrilinosWrappers::MPI::BlockVector, deal_II_space_dimension>;
-#  endif
+    template class MappingQ1Eulerian<deal_II_dimension, VEC, deal_II_space_dimension>;
 #endif
   }
+
+

diff --git a/source/fe/mapping_q_eulerian.cc b/source/fe/mapping_q_eulerian.cc
index 672328a5b3c56d70d2a45c1b166032f60ea5366c..d3500e72a898b9f8ebe805f8258968657c1edd31 100644 (file)
--- a/source/fe/mapping_q_eulerian.cc
+++ b/source/fe/mapping_q_eulerian.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2015 by the deal.II authors
+// Copyright (C) 2001 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -16,7 +16,11 @@
 #include <deal.II/base/utilities.h>
 #include <deal.II/base/quadrature_lib.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>
 #include <deal.II/lac/trilinos_block_vector.h>
 #include <deal.II/lac/trilinos_parallel_block_vector.h>

diff --git a/source/fe/mapping_q_eulerian.inst.in b/source/fe/mapping_q_eulerian.inst.in
index cd10db6e2eeb6b02e07bf224642e2624e65225cb..9b52c8909561a7d70082332a8cbe004e30442593 100644 (file)
--- a/source/fe/mapping_q_eulerian.inst.in
+++ b/source/fe/mapping_q_eulerian.inst.in
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 1998 - 2015 by the deal.II authors
+// Copyright (C) 1998 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -14,30 +14,10 @@
 // ---------------------------------------------------------------------
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : REAL_SERIAL_VECTORS)
   {
 #if deal_II_dimension <= deal_II_space_dimension       
-    template class MappingQEulerian<deal_II_dimension, Vector<double>, deal_II_space_dimension>;
-    template class MappingQEulerian<deal_II_dimension, Vector<float>,  deal_II_space_dimension>;
-#  ifdef DEAL_II_WITH_PETSC
-#  ifndef PETSC_USE_COMPLEX
-    template class MappingQEulerian<deal_II_dimension,
-                                   PETScWrappers::Vector, deal_II_space_dimension>;
-    template class MappingQEulerian<deal_II_dimension,
-                                   PETScWrappers::MPI::Vector, deal_II_space_dimension>;
-#  endif
-#  endif   
-#  ifdef DEAL_II_WITH_TRILINOS
-    template class MappingQEulerian<deal_II_dimension,
-                                    TrilinosWrappers::Vector, deal_II_space_dimension>;
-    template class MappingQEulerian<deal_II_dimension,
-                                    TrilinosWrappers::MPI::Vector, deal_II_space_dimension>;
-    template class MappingQEulerian<deal_II_dimension,
-                                    TrilinosWrappers::BlockVector, deal_II_space_dimension>;
-    template class MappingQEulerian<deal_II_dimension,
-                                    TrilinosWrappers::MPI::BlockVector, deal_II_space_dimension>;
-#  endif
-
+    template class MappingQEulerian<deal_II_dimension, VEC, deal_II_space_dimension>;
 #endif
   }