From d10993f7189b6aeba3a396e8f04af0a3fa895d9a Mon Sep 17 00:00:00 2001 From: bangerth Date: Mon, 29 Nov 2010 21:24:09 +0000 Subject: [PATCH] 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 --- deal.II/source/fe/fe_tools.inst.in | 5 ----- deal.II/source/grid/grid_generator.inst.in | 3 ++- deal.II/source/grid/grid_out.inst.in | 7 +++++++ deal.II/source/multigrid/mg_tools.inst.in | 6 ++++++ deal.II/source/numerics/vectors.inst.in | 6 ++++++ 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/deal.II/source/fe/fe_tools.inst.in b/deal.II/source/fe/fe_tools.inst.in index 16f935646f..84ea48ab9d 100644 --- 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 (const std::string &); - template - void add_fe_name( - const std::string& , - const FEFactoryBase* ); - template void compute_projection_from_quadrature_points_matrix (const FiniteElement &, diff --git a/deal.II/source/grid/grid_generator.inst.in b/deal.II/source/grid/grid_generator.inst.in index 56fff82cd5..59815baebf 100644 --- 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&, const Point&, bool); +#if deal_II_dimension > 1 template void GridGenerator::enclosed_hyper_cube ( Triangulation&, double, double, double, bool); @@ -56,7 +57,6 @@ for (deal_II_dimension : DIMENSIONS) GridGenerator::cylinder ( Triangulation&, double, double); - template void GridGenerator::truncated_cone ( Triangulation&, double, double, double); @@ -99,6 +99,7 @@ for (deal_II_dimension : DIMENSIONS) GridGenerator:: laplace_transformation (Triangulation &, const std::map > &); +#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 70af179131..250bf54245 100644 --- 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&, std::ostream&) const; +#endif + template void GridOut::write_msh (const Triangulation&, std::ostream&) const; + +#if deal_II_dimension != 2 template void GridOut::write_xfig (const Triangulation&, std::ostream&, const Mapping*) const; +#endif + template void GridOut::write_gnuplot (const Triangulation&, std::ostream&, diff --git a/deal.II/source/multigrid/mg_tools.inst.in b/deal.II/source/multigrid/mg_tools.inst.in index 26ccd68f16..94bb9c57f0 100644 --- 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 ( for (deal_II_dimension : DIMENSIONS) { +#if deal_II_dimension > 1 template void MGTools::compute_row_length_vector( const MGDoFHandler&, unsigned int, @@ -64,6 +65,7 @@ MGTools::compute_row_length_vector( const MGDoFHandler&, unsigned int, std::vector&, const Table<2,DoFTools::Coupling>&, const Table<2,DoFTools::Coupling>&); +#endif template void MGTools::count_dofs_per_component ( const MGDoFHandler&, std::vector >&, @@ -75,11 +77,13 @@ template void MGTools::count_dofs_per_block ( const MGDoFHandler&, std::vector >&, std::vector); +#if deal_II_dimension > 1 template void MGTools::make_boundary_list( const MGDoFHandler&, const FunctionMap::type&, std::vector >&, const std::vector&); +#endif template void MGTools::make_boundary_list( const MGDoFHandler&, @@ -87,6 +91,7 @@ template void MGTools::make_boundary_list( std::vector&, const std::vector&); +#if deal_II_dimension > 1 template void MGTools:: @@ -98,6 +103,7 @@ void MGTools:: extract_inner_interface_dofs (const MGDoFHandler &mg_dof_handler, std::vector > &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 4a55495620..5cf87b4782 100644 --- 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 const Point &, Vector &); +#if deal_II_dimension > 1 template void VectorTools::create_boundary_right_hand_side @@ -379,6 +380,7 @@ VectorTools::create_boundary_right_hand_side const Function &, Vector &, const std::set &); +#endif template void @@ -389,6 +391,7 @@ VectorTools::create_boundary_right_hand_side Vector &, const std::set &); +#if deal_II_dimension > 1 template void VectorTools::create_boundary_right_hand_side @@ -398,6 +401,7 @@ VectorTools::create_boundary_right_hand_side const Function &, Vector &, const std::set &); +#endif template void @@ -596,6 +600,7 @@ void VectorTools::interpolate_boundary_values ( const std::vector &); #endif +#if deal_II_dimension > 1 template void VectorTools::project_boundary_values (const Mapping &, @@ -603,6 +608,7 @@ void VectorTools::project_boundary_values const FunctionMap::type &, const Quadrature&, std::map&, std::vector); +#endif template void VectorTools::project_boundary_values -- 2.39.5