Do not include functions in explicit instantiations that are explicitly specialized.

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

diff --git a/deal.II/source/fe/fe_tools.inst.in b/deal.II/source/fe/fe_tools.inst.in
index 16f935646ffc976c6551ffb5a03f1c78ddfbaf82..84ea48ab9d628adb8cb0aabd805ffcf5407b30e1 100644 (file)
--- a/deal.II/source/fe/fe_tools.inst.in
+++ b/deal.II/source/fe/fe_tools.inst.in
@@ -452,11 +452,6 @@ for (deal_II_dimension : DIMENSIONS)
   get_fe_from_name<deal_II_dimension> (const std::string &);
 
 
-  template
-  void add_fe_name<deal_II_dimension>(
-    const std::string& ,
-    const FEFactoryBase<deal_II_dimension>* );
-
   template
   void
   compute_projection_from_quadrature_points_matrix (const FiniteElement<deal_II_dimension> &,

diff --git a/deal.II/source/grid/grid_generator.inst.in b/deal.II/source/grid/grid_generator.inst.in
index 56fff82cd5845d252625d8332fd676fb92d5fdf7..59815baebf99bd39eda262cb74be3d92bad0c462 100644 (file)
--- a/deal.II/source/grid/grid_generator.inst.in
+++ b/deal.II/source/grid/grid_generator.inst.in
@@ -43,6 +43,7 @@ for (deal_II_dimension : DIMENSIONS)
      const Point<deal_II_dimension>&,
      const Point<deal_II_dimension>&, bool);
 
+#if deal_II_dimension > 1
   template void
     GridGenerator::enclosed_hyper_cube (
       Triangulation<deal_II_dimension>&, double, double, double, bool);
@@ -56,7 +57,6 @@ for (deal_II_dimension : DIMENSIONS)
     GridGenerator::cylinder (
       Triangulation<deal_II_dimension>&, double, double);
 
-
   template void
     GridGenerator::truncated_cone (
       Triangulation<deal_II_dimension>&, double, double, double);
@@ -99,6 +99,7 @@ for (deal_II_dimension : DIMENSIONS)
     GridGenerator::
     laplace_transformation<deal_II_dimension> (Triangulation<deal_II_dimension> &,
                                               const std::map<unsigned int,Point<deal_II_dimension> > &);
+#endif
 
 #if deal_II_dimension != 3
 

diff --git a/deal.II/source/grid/grid_out.inst.in b/deal.II/source/grid/grid_out.inst.in
index 70af179131c80f43ed2b5799ea17be3c19a21c02..250bf542452b9e62cee1185bed477e7c86a5eae7 100644 (file)
--- a/deal.II/source/grid/grid_out.inst.in
+++ b/deal.II/source/grid/grid_out.inst.in
@@ -14,16 +14,23 @@
 
 for (deal_II_dimension : DIMENSIONS)
   {
+#if deal_II_dimension > 1
     template void GridOut::write_dx
       (const Triangulation<deal_II_dimension>&,
        std::ostream&) const;
+#endif
+
     template void GridOut::write_msh
       (const Triangulation<deal_II_dimension>&,
        std::ostream&) const;
+
+#if deal_II_dimension != 2
     template void GridOut::write_xfig
       (const Triangulation<deal_II_dimension>&,
        std::ostream&,
        const Mapping<deal_II_dimension,deal_II_dimension>*) const;
+#endif
+
     template void GridOut::write_gnuplot
       (const Triangulation<deal_II_dimension>&,
        std::ostream&,

diff --git a/deal.II/source/multigrid/mg_tools.inst.in b/deal.II/source/multigrid/mg_tools.inst.in
index 26ccd68f16ef03aef4278cf665234998dee11639..94bb9c57f07d0b5d9fc43929409720ca6951d8ed 100644 (file)
--- a/deal.II/source/multigrid/mg_tools.inst.in
+++ b/deal.II/source/multigrid/mg_tools.inst.in
@@ -55,6 +55,7 @@ MGTools::make_flux_sparsity_pattern_edge<deal_II_dimension> (
 
 for (deal_II_dimension : DIMENSIONS)
   {
+#if deal_II_dimension > 1
 template void
 MGTools::compute_row_length_vector(
   const MGDoFHandler<deal_II_dimension>&, unsigned int,
@@ -64,6 +65,7 @@ MGTools::compute_row_length_vector(
   const MGDoFHandler<deal_II_dimension>&, unsigned int,
   std::vector<unsigned int>&,
   const Table<2,DoFTools::Coupling>&, const Table<2,DoFTools::Coupling>&);
+#endif
 
 template void MGTools::count_dofs_per_component<deal_II_dimension> (
   const MGDoFHandler<deal_II_dimension>&, std::vector<std::vector<unsigned int> >&,
@@ -75,11 +77,13 @@ template void MGTools::count_dofs_per_block<deal_II_dimension> (
   const MGDoFHandler<deal_II_dimension>&, std::vector<std::vector<unsigned int> >&,
   std::vector<unsigned int>);
 
+#if deal_II_dimension > 1
 template void MGTools::make_boundary_list(
   const MGDoFHandler<deal_II_dimension>&,
   const FunctionMap<deal_II_dimension>::type&,
   std::vector<std::set<unsigned int> >&,
   const std::vector<bool>&);
+#endif
 
 template void MGTools::make_boundary_list(
   const MGDoFHandler<deal_II_dimension>&,
@@ -87,6 +91,7 @@ template void MGTools::make_boundary_list(
   std::vector<IndexSet>&,
   const std::vector<bool>&);
 
+#if deal_II_dimension > 1
 template
 void
 MGTools::
@@ -98,6 +103,7 @@ void
 MGTools::
 extract_inner_interface_dofs (const MGDoFHandler<deal_II_dimension> &mg_dof_handler,
                              std::vector<std::vector<bool> >  &interface_dofs);
+#endif
 
 #if deal_II_dimension < 3
 

diff --git a/deal.II/source/numerics/vectors.inst.in b/deal.II/source/numerics/vectors.inst.in
index 4a55495620d3acad1d4a1ace6ec565fc7b543d92..5cf87b478249b5a28efc87d4b5b973ffd0a11244 100644 (file)
--- a/deal.II/source/numerics/vectors.inst.in
+++ b/deal.II/source/numerics/vectors.inst.in
@@ -370,6 +370,7 @@ void VectorTools::create_point_source_vector<deal_II_dimension>
  const Point<deal_II_dimension>      &,
  Vector<double>                      &);
 
+#if deal_II_dimension > 1
 template
 void
 VectorTools::create_boundary_right_hand_side<deal_II_dimension>
@@ -379,6 +380,7 @@ VectorTools::create_boundary_right_hand_side<deal_II_dimension>
  const Function<deal_II_dimension>   &,
  Vector<double>                      &,
  const std::set<unsigned char> &);
+#endif
 
 template
 void
@@ -389,6 +391,7 @@ VectorTools::create_boundary_right_hand_side<deal_II_dimension>
  Vector<double>                      &,
  const std::set<unsigned char> &);
 
+#if deal_II_dimension > 1
 template
 void
 VectorTools::create_boundary_right_hand_side<deal_II_dimension>
@@ -398,6 +401,7 @@ VectorTools::create_boundary_right_hand_side<deal_II_dimension>
  const Function<deal_II_dimension>   &,
  Vector<double>                      &,
  const std::set<unsigned char> &);
+#endif
 
 template
 void
@@ -596,6 +600,7 @@ void VectorTools::interpolate_boundary_values (
   const std::vector<bool>    &);
 #endif
 
+#if deal_II_dimension > 1
 template
 void VectorTools::project_boundary_values<deal_II_dimension>
 (const Mapping<deal_II_dimension>     &,
@@ -603,6 +608,7 @@ void VectorTools::project_boundary_values<deal_II_dimension>
  const FunctionMap<deal_II_dimension>::type &,
  const Quadrature<deal_II_dimension-1>&,
  std::map<unsigned int,double>&, std::vector<unsigned int>);
+#endif
 
 template
 void VectorTools::project_boundary_values<deal_II_dimension>