From 9ad1abbf24772309416488672bad8502b53dce83 Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 25 Mar 2002 11:10:04 +0000 Subject: [PATCH] Make the syntax for explicit instantiations of member templates C++ standard conforming. git-svn-id: https://svn.dealii.org/trunk@5609 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/dofs/dof_accessor.cc | 128 ++--- .../deal.II/source/dofs/dof_constraints.cc | 20 +- .../deal.II/source/dofs/dof_renumbering.cc | 52 +- deal.II/deal.II/source/dofs/dof_tools.cc | 232 ++++---- deal.II/deal.II/source/fe/fe_tools.cc | 108 ++-- deal.II/deal.II/source/fe/fe_values.cc | 96 ++-- .../deal.II/source/fe/mapping_cartesian.cc | 8 +- deal.II/deal.II/source/fe/mapping_q1.cc | 8 +- deal.II/deal.II/source/grid/grid_generator.cc | 18 +- deal.II/deal.II/source/grid/grid_out.cc | 24 +- .../deal.II/source/grid/grid_refinement.cc | 46 +- .../deal.II/source/grid/grid_reordering.cc | 2 +- deal.II/deal.II/source/grid/grid_tools.cc | 2 +- .../deal.II/source/multigrid/mg_dof_tools.cc | 148 +++--- .../deal.II/source/multigrid/mg_smoother.cc | 23 +- deal.II/deal.II/source/multigrid/multigrid.cc | 10 +- deal.II/deal.II/source/numerics/data_out.cc | 24 +- .../deal.II/source/numerics/data_out_stack.cc | 8 +- .../numerics/derivative_approximation.cc | 36 +- deal.II/deal.II/source/numerics/histogram.cc | 28 +- .../numerics/matrices.all_dimensions.cc | 20 +- deal.II/deal.II/source/numerics/matrices.cc | 118 ++-- .../source/numerics/solution_transfer.cc | 2 +- deal.II/deal.II/source/numerics/vectors.cc | 502 +++++++++--------- deal.II/doc/news/2002/c-3-3.html | 9 + deal.II/lac/source/block_vector.cc | 20 +- deal.II/lac/source/full_matrix.double.cc | 76 +-- deal.II/lac/source/full_matrix.float.cc | 78 +-- deal.II/lac/source/precondition_block.cc | 96 ++-- deal.II/lac/source/sparse_ilu.cc | 32 +- deal.II/lac/source/sparse_vanka.cc | 16 +- deal.II/lac/source/sparsity_pattern.cc | 4 +- deal.II/lac/source/vector.cc | 28 +- deal.II/lac/source/vector.long_double.cc | 38 +- 34 files changed, 1035 insertions(+), 1025 deletions(-) diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index ffc00667c1..22aade4633 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -742,92 +742,92 @@ DoFCellAccessor::set_dof_values_by_interpolation (const Vector &loc // for double template void -DoFObjectAccessor<1,deal_II_dimension>::get_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<1,deal_II_dimension>::get_dof_values<> (const Vector &, + Vector &) const; template void -DoFObjectAccessor<1,deal_II_dimension>::set_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<1,deal_II_dimension>::set_dof_values<> (const Vector &, + Vector &) const; // for float template void -DoFObjectAccessor<1,deal_II_dimension>::get_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<1,deal_II_dimension>::get_dof_values<> (const Vector &, + Vector &) const; template void -DoFObjectAccessor<1,deal_II_dimension>::set_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<1,deal_II_dimension>::set_dof_values<> (const Vector &, + Vector &) const; // for block vector template void -DoFObjectAccessor<1,deal_II_dimension>::get_dof_values (const BlockVector &, - Vector &) const; +DoFObjectAccessor<1,deal_II_dimension>::get_dof_values<> (const BlockVector &, + Vector &) const; template void -DoFObjectAccessor<1,deal_II_dimension>::set_dof_values (const Vector &, - BlockVector &) const; +DoFObjectAccessor<1,deal_II_dimension>::set_dof_values<> (const Vector &, + BlockVector &) const; template void -DoFObjectAccessor<1,deal_II_dimension>::get_dof_values (const BlockVector &, - Vector &) const; +DoFObjectAccessor<1,deal_II_dimension>::get_dof_values<> (const BlockVector &, + Vector &) const; template void -DoFObjectAccessor<1,deal_II_dimension>::set_dof_values (const Vector &, - BlockVector &) const; +DoFObjectAccessor<1,deal_II_dimension>::set_dof_values<> (const Vector &, + BlockVector &) const; #if deal_II_dimension >= 2 // for double template void -DoFObjectAccessor<2,deal_II_dimension>::get_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<2,deal_II_dimension>::get_dof_values<> (const Vector &, + Vector &) const; template void -DoFObjectAccessor<2,deal_II_dimension>::set_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<2,deal_II_dimension>::set_dof_values<> (const Vector &, + Vector &) const; // for float template void -DoFObjectAccessor<2,deal_II_dimension>::get_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<2,deal_II_dimension>::get_dof_values<> (const Vector &, + Vector &) const; template void -DoFObjectAccessor<2,deal_II_dimension>::set_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<2,deal_II_dimension>::set_dof_values<> (const Vector &, + Vector &) const; // for block vector template void -DoFObjectAccessor<2,deal_II_dimension>::get_dof_values (const BlockVector &, - Vector &) const; +DoFObjectAccessor<2,deal_II_dimension>::get_dof_values<> (const BlockVector &, + Vector &) const; template void -DoFObjectAccessor<2,deal_II_dimension>::set_dof_values (const Vector &, - BlockVector &) const; +DoFObjectAccessor<2,deal_II_dimension>::set_dof_values<> (const Vector &, + BlockVector &) const; template void -DoFObjectAccessor<2,deal_II_dimension>::get_dof_values (const BlockVector &, - Vector &) const; +DoFObjectAccessor<2,deal_II_dimension>::get_dof_values<> (const BlockVector &, + Vector &) const; template void -DoFObjectAccessor<2,deal_II_dimension>::set_dof_values (const Vector &, - BlockVector &) const; +DoFObjectAccessor<2,deal_II_dimension>::set_dof_values<> (const Vector &, + BlockVector &) const; #endif @@ -837,44 +837,44 @@ DoFObjectAccessor<2,deal_II_dimension>::set_dof_values (const Vector &, // for double template void -DoFObjectAccessor<3,deal_II_dimension>::get_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<3,deal_II_dimension>::get_dof_values<> (const Vector &, + Vector &) const; template void -DoFObjectAccessor<3,deal_II_dimension>::set_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<3,deal_II_dimension>::set_dof_values<> (const Vector &, + Vector &) const; // for float template void -DoFObjectAccessor<3,deal_II_dimension>::get_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<3,deal_II_dimension>::get_dof_values<> (const Vector &, + Vector &) const; template void -DoFObjectAccessor<3,deal_II_dimension>::set_dof_values (const Vector &, - Vector &) const; +DoFObjectAccessor<3,deal_II_dimension>::set_dof_values<> (const Vector &, + Vector &) const; // for block vector template void -DoFObjectAccessor<3,deal_II_dimension>::get_dof_values (const BlockVector &, - Vector &) const; +DoFObjectAccessor<3,deal_II_dimension>::get_dof_values<> (const BlockVector &, + Vector &) const; template void -DoFObjectAccessor<3,deal_II_dimension>::set_dof_values (const Vector &, - BlockVector &) const; +DoFObjectAccessor<3,deal_II_dimension>::set_dof_values<> (const Vector &, + BlockVector &) const; template void -DoFObjectAccessor<3,deal_II_dimension>::get_dof_values (const BlockVector &, - Vector &) const; +DoFObjectAccessor<3,deal_II_dimension>::get_dof_values<> (const BlockVector &, + Vector &) const; template void -DoFObjectAccessor<3,deal_II_dimension>::set_dof_values (const Vector &, - BlockVector &) const; +DoFObjectAccessor<3,deal_II_dimension>::set_dof_values<> (const Vector &, + BlockVector &) const; #endif @@ -884,52 +884,52 @@ DoFObjectAccessor<3,deal_II_dimension>::set_dof_values (const Vector &, template void DoFCellAccessor:: -get_interpolated_dof_values (const Vector &, - Vector &) const; +get_interpolated_dof_values<> (const Vector &, + Vector &) const; template void DoFCellAccessor:: -set_dof_values_by_interpolation(const Vector &, - Vector &) const; +set_dof_values_by_interpolation<>(const Vector &, + Vector &) const; template void DoFCellAccessor:: -get_interpolated_dof_values (const Vector &, - Vector &) const; +get_interpolated_dof_values<> (const Vector &, + Vector &) const; template void DoFCellAccessor:: -set_dof_values_by_interpolation(const Vector &, - Vector &) const; +set_dof_values_by_interpolation<>(const Vector &, + Vector &) const; template void DoFCellAccessor:: -get_interpolated_dof_values (const BlockVector &, - Vector &) const; +get_interpolated_dof_values<> (const BlockVector &, + Vector &) const; template void DoFCellAccessor:: -set_dof_values_by_interpolation(const Vector &, - BlockVector &) const; +set_dof_values_by_interpolation<>(const Vector &, + BlockVector &) const; template void DoFCellAccessor:: -get_interpolated_dof_values (const BlockVector &, - Vector &) const; +get_interpolated_dof_values<> (const BlockVector &, + Vector &) const; template void DoFCellAccessor:: -set_dof_values_by_interpolation(const Vector &, - BlockVector &) const; +set_dof_values_by_interpolation<>(const Vector &, + BlockVector &) const; template class DoFAccessor; diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc index 2f69f6d93b..e713eee747 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/deal.II/source/dofs/dof_constraints.cc @@ -1202,21 +1202,21 @@ ConstraintMatrix::memory_consumption () const // syntax... #define vector_functions \ - template void ConstraintMatrix::condense(const VectorType &uncondensed,\ - VectorType &condensed) const;\ - template void ConstraintMatrix::condense(VectorType &vec) const;\ - template void ConstraintMatrix::set_zero(VectorType &vec) const;\ - template void ConstraintMatrix::distribute(const VectorType &condensed,\ - VectorType &uncondensed) const;\ - template void ConstraintMatrix::distribute(VectorType &vec) const; + template void ConstraintMatrix::condense<>(const VectorType &uncondensed,\ + VectorType &condensed) const;\ + template void ConstraintMatrix::condense<>(VectorType &vec) const;\ + template void ConstraintMatrix::set_zero<>(VectorType &vec) const;\ + template void ConstraintMatrix::distribute<>(const VectorType &condensed,\ + VectorType &uncondensed) const;\ + template void ConstraintMatrix::distribute<>(VectorType &vec) const; #define matrix_functions_1 \ - template void ConstraintMatrix::condense(const MatrixType &uncondensed,\ - MatrixType &condensed) const; + template void ConstraintMatrix::condense<>(const MatrixType &uncondensed,\ + MatrixType &condensed) const; #define matrix_functions_2 \ - template void ConstraintMatrix::condense(MatrixType &uncondensed) const; + template void ConstraintMatrix::condense<>(MatrixType &uncondensed) const; diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc index ceb2a225a2..f14d7b6aa3 100644 --- a/deal.II/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc @@ -863,50 +863,50 @@ DoFRenumbering::random (DoFHandler &dof_handler) // explicit instantiations template -void DoFRenumbering::Cuthill_McKee (DoFHandler&, - const bool, - const bool, - const std::vector&); +void DoFRenumbering::Cuthill_McKee<> (DoFHandler&, + const bool, + const bool, + const std::vector&); template -void DoFRenumbering::component_wise (DoFHandler&, - const std::vector&); +void DoFRenumbering::component_wise<> (DoFHandler&, + const std::vector&); template -void DoFRenumbering::component_wise (MGDoFHandler&, - unsigned int, - const std::vector&); +void DoFRenumbering::component_wise<> (MGDoFHandler&, + unsigned int, + const std::vector&); template -void DoFRenumbering::cell_wise_dg (DoFHandler&, - const std::vector::cell_iterator>&); +void DoFRenumbering::cell_wise_dg<> (DoFHandler&, + const std::vector::cell_iterator>&); template -void DoFRenumbering::downstream_dg (DoFHandler&, - const Point&); +void DoFRenumbering::downstream_dg<> (DoFHandler&, + const Point&); template -void DoFRenumbering::sort_selected_dofs_back (DoFHandler &, - const std::vector &); +void DoFRenumbering::sort_selected_dofs_back<> (DoFHandler &, + const std::vector &); template -void DoFRenumbering::random (DoFHandler &); +void DoFRenumbering::random<> (DoFHandler &); #ifdef ENABLE_MULTIGRID template -void DoFRenumbering::Cuthill_McKee (MGDoFHandler&, - const unsigned int, - const bool, - const std::vector&); +void DoFRenumbering::Cuthill_McKee<> (MGDoFHandler&, + const unsigned int, + const bool, + const std::vector&); template -void DoFRenumbering::cell_wise_dg (MGDoFHandler&, - const unsigned int, - const std::vector::cell_iterator>&); +void DoFRenumbering::cell_wise_dg<> (MGDoFHandler&, + const unsigned int, + const std::vector::cell_iterator>&); template -void DoFRenumbering::downstream_dg (MGDoFHandler&, - const unsigned int, - const Point&); +void DoFRenumbering::downstream_dg<> (MGDoFHandler&, + const unsigned int, + const Point&); #endif diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 85809786b0..73684c83b3 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -2342,183 +2342,183 @@ DoFTools::map_dofs_to_support_points (const Mapping &mapping, // explicit instantiations template void -DoFTools::make_flux_sparsity_pattern (const DoFHandler& dof, - SparsityPattern &sparsity); +DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, + SparsityPattern &sparsity); #if deal_II_dimension > 1 template void -DoFTools::make_flux_sparsity_pattern (const DoFHandler& dof, - SparsityPattern &, - const FullMatrix&, - const FullMatrix&); +DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, + SparsityPattern &, + const FullMatrix&, + const FullMatrix&); template void -DoFTools::make_flux_sparsity_pattern (const DoFHandler& dof, - CompressedSparsityPattern &sparsity); +DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, + CompressedSparsityPattern &sparsity); template void -DoFTools::make_flux_sparsity_pattern (const DoFHandler& dof, - CompressedSparsityPattern &, - const FullMatrix&, - const FullMatrix&); +DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, + CompressedSparsityPattern &, + const FullMatrix&, + const FullMatrix&); template void -DoFTools::make_flux_sparsity_pattern (const DoFHandler& dof, - BlockSparsityPattern &sparsity); +DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, + BlockSparsityPattern &sparsity); template void -DoFTools::make_flux_sparsity_pattern (const DoFHandler& dof, - BlockSparsityPattern &, - const FullMatrix&, - const FullMatrix&); +DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, + BlockSparsityPattern &, + const FullMatrix&, + const FullMatrix&); template void -DoFTools::make_flux_sparsity_pattern (const DoFHandler& dof, - CompressedBlockSparsityPattern &sparsity); +DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, + CompressedBlockSparsityPattern &sparsity); template void -DoFTools::make_flux_sparsity_pattern (const DoFHandler& dof, - CompressedBlockSparsityPattern &, - const FullMatrix&, - const FullMatrix&); +DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, + CompressedBlockSparsityPattern &, + const FullMatrix&, + const FullMatrix&); #endif template void -DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, - const std::vector &, - SparsityPattern &); +DoFTools::make_boundary_sparsity_pattern<> (const DoFHandler& dof, + const std::vector &, + SparsityPattern &); template void -DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, - const std::vector &, - CompressedSparsityPattern &); +DoFTools::make_boundary_sparsity_pattern<> (const DoFHandler& dof, + const std::vector &, + CompressedSparsityPattern &); template void -DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, - const std::vector &, - BlockSparsityPattern &); +DoFTools::make_boundary_sparsity_pattern<> (const DoFHandler& dof, + const std::vector &, + BlockSparsityPattern &); template void -DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, - const std::vector &, - CompressedBlockSparsityPattern &); +DoFTools::make_boundary_sparsity_pattern<> (const DoFHandler& dof, + const std::vector &, + CompressedBlockSparsityPattern &); template void -DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, - const FunctionMap::type &boundary_indicators, - const std::vector &dof_to_boundary_mapping, - SparsityPattern &sparsity); +DoFTools::make_boundary_sparsity_pattern<> (const DoFHandler& dof, + const FunctionMap::type &boundary_indicators, + const std::vector &dof_to_boundary_mapping, + SparsityPattern &sparsity); template void -DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, - const FunctionMap::type &boundary_indicators, - const std::vector &dof_to_boundary_mapping, - CompressedSparsityPattern &sparsity); +DoFTools::make_boundary_sparsity_pattern<> (const DoFHandler& dof, + const FunctionMap::type &boundary_indicators, + const std::vector &dof_to_boundary_mapping, + CompressedSparsityPattern &sparsity); template void -DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, - const FunctionMap::type &boundary_indicators, - const std::vector &dof_to_boundary_mapping, - BlockSparsityPattern &sparsity); +DoFTools::make_boundary_sparsity_pattern<> (const DoFHandler& dof, + const FunctionMap::type &boundary_indicators, + const std::vector &dof_to_boundary_mapping, + BlockSparsityPattern &sparsity); template void -DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, - const FunctionMap::type &boundary_indicators, - const std::vector &dof_to_boundary_mapping, - CompressedBlockSparsityPattern &sparsity); +DoFTools::make_boundary_sparsity_pattern<> (const DoFHandler& dof, + const FunctionMap::type &boundary_indicators, + const std::vector &dof_to_boundary_mapping, + CompressedBlockSparsityPattern &sparsity); template void -DoFTools::make_sparsity_pattern (const DoFHandler &dof, - SparsityPattern &sparsity); +DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, + SparsityPattern &sparsity); template void -DoFTools::make_sparsity_pattern (const DoFHandler &dof, - CompressedSparsityPattern &sparsity); +DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, + CompressedSparsityPattern &sparsity); template void -DoFTools::make_sparsity_pattern (const DoFHandler &dof, - BlockSparsityPattern &sparsity); +DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, + BlockSparsityPattern &sparsity); template void -DoFTools::make_sparsity_pattern (const DoFHandler &dof, - CompressedBlockSparsityPattern &sparsity); +DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, + CompressedBlockSparsityPattern &sparsity); template void -DoFTools::make_sparsity_pattern (const DoFHandler &dof, - const std::vector > &mask, - SparsityPattern &sparsity); +DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, + const std::vector > &mask, + SparsityPattern &sparsity); template void -DoFTools::make_sparsity_pattern (const DoFHandler &dof, - const std::vector > &mask, - CompressedSparsityPattern &sparsity); +DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, + const std::vector > &mask, + CompressedSparsityPattern &sparsity); template void -DoFTools::make_sparsity_pattern (const DoFHandler &dof, - const std::vector > &mask, - BlockSparsityPattern &sparsity); +DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, + const std::vector > &mask, + BlockSparsityPattern &sparsity); template void -DoFTools::make_sparsity_pattern (const DoFHandler &dof, - const std::vector > &mask, - CompressedBlockSparsityPattern &sparsity); +DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, + const std::vector > &mask, + CompressedBlockSparsityPattern &sparsity); template void -DoFTools::distribute_cell_to_dof_vector (const DoFHandler &dof_handler, - const Vector &cell_data, - Vector &dof_data, - const unsigned int component); +DoFTools::distribute_cell_to_dof_vector<> (const DoFHandler &dof_handler, + const Vector &cell_data, + Vector &dof_data, + const unsigned int component); template void -DoFTools::distribute_cell_to_dof_vector (const DoFHandler &dof_handler, - const Vector &cell_data, - Vector &dof_data, - const unsigned int component); +DoFTools::distribute_cell_to_dof_vector<> (const DoFHandler &dof_handler, + const Vector &cell_data, + Vector &dof_data, + const unsigned int component); -template void DoFTools::extract_dofs(const DoFHandler& dof, - const std::vector& component_select, - std::vector& selected_dofs); +template void DoFTools::extract_dofs<>(const DoFHandler& dof, + const std::vector& component_select, + std::vector& selected_dofs); #ifdef ENABLE_MULTIGRID -template void DoFTools::extract_level_dofs(const unsigned int level, - const MGDoFHandler& dof, - const std::vector& component_select, - std::vector& selected_dofs); +template void DoFTools::extract_level_dofs<>(const unsigned int level, + const MGDoFHandler& dof, + const std::vector& component_select, + std::vector& selected_dofs); #endif #if deal_II_dimension != 1 template void -DoFTools::extract_boundary_dofs (const DoFHandler &, - const std::vector &, - std::vector &, - const std::set &); +DoFTools::extract_boundary_dofs<> (const DoFHandler &, + const std::vector &, + std::vector &, + const std::set &); #endif template void -DoFTools::extract_subdomain_dofs (const DoFHandler &dof_handler, - const unsigned int subdomain_id, - std::vector &selected_dofs); +DoFTools::extract_subdomain_dofs<> (const DoFHandler &dof_handler, + const unsigned int subdomain_id, + std::vector &selected_dofs); template void -DoFTools::count_dofs_per_component (const DoFHandler &dof_handler, - std::vector &dofs_per_component); +DoFTools::count_dofs_per_component<> (const DoFHandler &dof_handler, + std::vector &dofs_per_component); template void -DoFTools::compute_intergrid_constraints (const DoFHandler &, - const unsigned int , - const DoFHandler &, - const unsigned int , - const InterGridMap &, - ConstraintMatrix &); +DoFTools::compute_intergrid_constraints<> (const DoFHandler &, + const unsigned int , + const DoFHandler &, + const unsigned int , + const InterGridMap &, + ConstraintMatrix &); template void -DoFTools::compute_intergrid_transfer_representation (const DoFHandler &, - const unsigned int , - const DoFHandler &, - const unsigned int , - const InterGridMap &, - std::vector > &); +DoFTools::compute_intergrid_transfer_representation<> (const DoFHandler &, + const unsigned int , + const DoFHandler &, + const unsigned int , + const InterGridMap &, + std::vector > &); @@ -2526,14 +2526,14 @@ DoFTools::compute_intergrid_transfer_representation (const DoFHandler &, - std::vector &); +DoFTools::map_dof_to_boundary_indices<> (const DoFHandler &, + std::vector &); template void -DoFTools::map_dof_to_boundary_indices (const DoFHandler &, - const std::set &, - std::vector &); +DoFTools::map_dof_to_boundary_indices<> (const DoFHandler &, + const std::set &, + std::vector &); #endif @@ -2541,6 +2541,6 @@ DoFTools::map_dof_to_boundary_indices (const DoFHandler &, template void -DoFTools::map_dofs_to_support_points (const Mapping &mapping, - const DoFHandler &dof_handler, - std::vector > &support_points); +DoFTools::map_dofs_to_support_points<> (const Mapping &mapping, + const DoFHandler &dof_handler, + std::vector > &support_points); diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index ed5c3bb823..8074e15806 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -711,79 +711,79 @@ FETools::lexicographic_to_hierarchic_numbering (const FE_Q &fe, /*-------------- Explicit Instantiations -------------------------------*/ template -void FETools::get_interpolation_matrix(const FiniteElement &, - const FiniteElement &, - FullMatrix &); +void FETools::get_interpolation_matrix<>(const FiniteElement &, + const FiniteElement &, + FullMatrix &); template -void FETools::get_back_interpolation_matrix(const FiniteElement &, - const FiniteElement &, - FullMatrix &); +void FETools::get_back_interpolation_matrix<>(const FiniteElement &, + const FiniteElement &, + FullMatrix &); template -void FETools::get_interpolation_difference_matrix(const FiniteElement &, - const FiniteElement &, - FullMatrix &); +void FETools::get_interpolation_difference_matrix<>(const FiniteElement &, + const FiniteElement &, + FullMatrix &); template -void FETools::interpolate(const DoFHandler &, - const Vector &, - const DoFHandler &, - Vector &); +void FETools::interpolate<>(const DoFHandler &, + const Vector &, + const DoFHandler &, + Vector &); template -void FETools::back_interpolate(const DoFHandler &, - const Vector &, - const FiniteElement &, - Vector &); +void FETools::back_interpolate<>(const DoFHandler &, + const Vector &, + const FiniteElement &, + Vector &); template -void FETools::interpolation_difference(const DoFHandler &, - const Vector &, - const FiniteElement &, - Vector &); +void FETools::interpolation_difference<>(const DoFHandler &, + const Vector &, + const FiniteElement &, + Vector &); template -void FETools::extrapolate(const DoFHandler &, - const Vector &, - const DoFHandler &, - Vector &); +void FETools::extrapolate<>(const DoFHandler &, + const Vector &, + const DoFHandler &, + Vector &); template -void FETools::get_interpolation_matrix(const FiniteElement &, - const FiniteElement &, - FullMatrix &); +void FETools::get_interpolation_matrix<>(const FiniteElement &, + const FiniteElement &, + FullMatrix &); template -void FETools::get_back_interpolation_matrix(const FiniteElement &, - const FiniteElement &, - FullMatrix &); +void FETools::get_back_interpolation_matrix<>(const FiniteElement &, + const FiniteElement &, + FullMatrix &); template -void FETools::get_interpolation_difference_matrix(const FiniteElement &, - const FiniteElement &, - FullMatrix &); +void FETools::get_interpolation_difference_matrix<>(const FiniteElement &, + const FiniteElement &, + FullMatrix &); template -void FETools::interpolate(const DoFHandler &, - const Vector &, - const DoFHandler &, - Vector &); +void FETools::interpolate<>(const DoFHandler &, + const Vector &, + const DoFHandler &, + Vector &); template -void FETools::back_interpolate(const DoFHandler &, - const Vector &, - const FiniteElement &, - Vector &); +void FETools::back_interpolate<>(const DoFHandler &, + const Vector &, + const FiniteElement &, + Vector &); template -void FETools::interpolation_difference(const DoFHandler &, - const Vector &, - const FiniteElement &, - Vector &); +void FETools::interpolation_difference<>(const DoFHandler &, + const Vector &, + const FiniteElement &, + Vector &); template -void FETools::extrapolate(const DoFHandler &, - const Vector &, - const DoFHandler &, - Vector &); +void FETools::extrapolate<>(const DoFHandler &, + const Vector &, + const DoFHandler &, + Vector &); template void -FETools::hierarchic_to_lexicographic_numbering (const FE_Q &fe, - std::vector &h2l); +FETools::hierarchic_to_lexicographic_numbering<> (const FE_Q &fe, + std::vector &h2l); template void -FETools::lexicographic_to_hierarchic_numbering (const FE_Q &fe, - std::vector &h2l); +FETools::lexicographic_to_hierarchic_numbering<> (const FE_Q &fe, + std::vector &h2l); /*---------------------------- fe_tools.cc ---------------------------*/ diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index 90e56ec6ef..47709dccee 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -835,88 +835,88 @@ template class FESubfaceValues; //----------------------------------------------------------------------------- template -void FEValuesBase::get_function_values (const Vector&, - std::vector&) const; +void FEValuesBase::get_function_values<> (const Vector&, + std::vector&) const; template -void FEValuesBase::get_function_values (const Vector&, - std::vector&) const; +void FEValuesBase::get_function_values<> (const Vector&, + std::vector&) const; template -void FEValuesBase::get_function_values (const Vector&, - std::vector&) const; +void FEValuesBase::get_function_values<> (const Vector&, + std::vector&) const; template -void FEValuesBase::get_function_values (const BlockVector&, - std::vector&) const; +void FEValuesBase::get_function_values<> (const BlockVector&, + std::vector&) const; template -void FEValuesBase::get_function_values (const BlockVector&, - std::vector&) const; +void FEValuesBase::get_function_values<> (const BlockVector&, + std::vector&) const; template -void FEValuesBase::get_function_values (const BlockVector&, - std::vector&) const; +void FEValuesBase::get_function_values<> (const BlockVector&, + std::vector&) const; //----------------------------------------------------------------------------- template -void FEValuesBase::get_function_values (const Vector &, - std::vector > &) const; +void FEValuesBase::get_function_values<> (const Vector &, + std::vector > &) const; template -void FEValuesBase::get_function_values (const Vector &, - std::vector > &) const; +void FEValuesBase::get_function_values<> (const Vector &, + std::vector > &) const; template -void FEValuesBase::get_function_values (const Vector &, - std::vector > &) const; +void FEValuesBase::get_function_values<> (const Vector &, + std::vector > &) const; template -void FEValuesBase::get_function_values (const BlockVector &, - std::vector > &) const; +void FEValuesBase::get_function_values<> (const BlockVector &, + std::vector > &) const; template -void FEValuesBase::get_function_values (const BlockVector &, - std::vector > &) const; +void FEValuesBase::get_function_values<> (const BlockVector &, + std::vector > &) const; //----------------------------------------------------------------------------- template -void FEValuesBase::get_function_grads (const Vector &, - std::vector > &) const; +void FEValuesBase::get_function_grads<> (const Vector &, + std::vector > &) const; template -void FEValuesBase::get_function_grads (const Vector &, - std::vector > &) const; +void FEValuesBase::get_function_grads<> (const Vector &, + std::vector > &) const; template -void FEValuesBase::get_function_grads (const BlockVector &, - std::vector > &) const; +void FEValuesBase::get_function_grads<> (const BlockVector &, + std::vector > &) const; //----------------------------------------------------------------------------- template -void FEValuesBase::get_function_grads (const Vector &, - std::vector > > &) const; +void FEValuesBase::get_function_grads<> (const Vector &, + std::vector > > &) const; template -void FEValuesBase::get_function_grads (const Vector &, - std::vector > > &) const; +void FEValuesBase::get_function_grads<> (const Vector &, + std::vector > > &) const; template -void FEValuesBase::get_function_grads (const BlockVector &, - std::vector > > &) const; +void FEValuesBase::get_function_grads<> (const BlockVector &, + std::vector > > &) const; template -void FEValuesBase::get_function_grads (const BlockVector &, - std::vector > > &) const; +void FEValuesBase::get_function_grads<> (const BlockVector &, + std::vector > > &) const; //----------------------------------------------------------------------------- template -void FEValuesBase::get_function_2nd_derivatives (const Vector &, - std::vector > &) const; +void FEValuesBase::get_function_2nd_derivatives<> (const Vector &, + std::vector > &) const; template -void FEValuesBase::get_function_2nd_derivatives (const Vector &, - std::vector > &) const; +void FEValuesBase::get_function_2nd_derivatives<> (const Vector &, + std::vector > &) const; template -void FEValuesBase::get_function_2nd_derivatives (const BlockVector &, - std::vector > &) const; +void FEValuesBase::get_function_2nd_derivatives<> (const BlockVector &, + std::vector > &) const; //----------------------------------------------------------------------------- template -void FEValuesBase::get_function_2nd_derivatives (const Vector &, - std::vector > > &) const; +void FEValuesBase::get_function_2nd_derivatives<> (const Vector &, + std::vector > > &) const; template -void FEValuesBase::get_function_2nd_derivatives (const Vector &, - std::vector > > &) const; +void FEValuesBase::get_function_2nd_derivatives<> (const Vector &, + std::vector > > &) const; template -void FEValuesBase::get_function_2nd_derivatives (const BlockVector &, - std::vector > > &) const; +void FEValuesBase::get_function_2nd_derivatives<> (const BlockVector &, + std::vector > > &) const; diff --git a/deal.II/deal.II/source/fe/mapping_cartesian.cc b/deal.II/deal.II/source/fe/mapping_cartesian.cc index 805453f2e9..fa7813c8da 100644 --- a/deal.II/deal.II/source/fe/mapping_cartesian.cc +++ b/deal.II/deal.II/source/fe/mapping_cartesian.cc @@ -625,25 +625,25 @@ covariant_transformation (typename std::vector &dst, template class MappingCartesian; -template void MappingCartesian::contravariant_transformation ( +template void MappingCartesian::contravariant_transformation<> ( std::vector > &dst, const std::vector > &src, const Mapping::InternalDataBase& internal, const unsigned int src_offset) const; -template void MappingCartesian::contravariant_transformation ( +template void MappingCartesian::contravariant_transformation<> ( std::vector > &dst, const std::vector > &src, const Mapping::InternalDataBase& internal, const unsigned int src_offset) const; -template void MappingCartesian::covariant_transformation ( +template void MappingCartesian::covariant_transformation<> ( std::vector > &dst, const std::vector > &src, const Mapping::InternalDataBase& internal, const unsigned int src_offset) const; -template void MappingCartesian::covariant_transformation ( +template void MappingCartesian::covariant_transformation<> ( std::vector > &dst, const std::vector > &src, const Mapping::InternalDataBase& internal, diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc index bd83e01d0f..01d908122f 100644 --- a/deal.II/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/deal.II/source/fe/mapping_q1.cc @@ -1037,25 +1037,25 @@ MappingQ1::covariant_transformation (std::vector &dst, template class MappingQ1; -template void MappingQ1::contravariant_transformation ( +template void MappingQ1::contravariant_transformation<> ( std::vector > &dst, const std::vector > &src, const Mapping::InternalDataBase& internal, const unsigned int src_offset) const; -template void MappingQ1::contravariant_transformation ( +template void MappingQ1::contravariant_transformation<> ( std::vector > &dst, const std::vector > &src, const Mapping::InternalDataBase& internal, const unsigned int src_offset) const; -template void MappingQ1::covariant_transformation ( +template void MappingQ1::covariant_transformation<> ( std::vector > &dst, const std::vector > &src, const Mapping::InternalDataBase& internal, const unsigned int src_offset) const; -template void MappingQ1::covariant_transformation ( +template void MappingQ1::covariant_transformation<> ( std::vector > &dst, const std::vector > &src, const Mapping::InternalDataBase& internal, diff --git a/deal.II/deal.II/source/grid/grid_generator.cc b/deal.II/deal.II/source/grid/grid_generator.cc index 92c4dfc4a4..1ac36b52ad 100644 --- a/deal.II/deal.II/source/grid/grid_generator.cc +++ b/deal.II/deal.II/source/grid/grid_generator.cc @@ -958,18 +958,18 @@ void GridGenerator::laplace_solve (const SparseMatrix &S, // explicit instantiations template void -GridGenerator::hyper_rectangle (Triangulation &, - const Point&, - const Point&, - const bool); +GridGenerator::hyper_rectangle<> (Triangulation &, + const Point&, + const Point&, + const bool); template void -GridGenerator::hyper_cube (Triangulation &, - const double, - const double); +GridGenerator::hyper_cube<> (Triangulation &, + const double, + const double); #if deal_II_dimension != 1 template void -GridGenerator::laplace_transformation (Triangulation &, - const std::map > &); +GridGenerator::laplace_transformation<> (Triangulation &, + const std::map > &); #endif diff --git a/deal.II/deal.II/source/grid/grid_out.cc b/deal.II/deal.II/source/grid/grid_out.cc index 85b8906af0..69290cc098 100644 --- a/deal.II/deal.II/source/grid/grid_out.cc +++ b/deal.II/deal.II/source/grid/grid_out.cc @@ -839,17 +839,17 @@ void GridOut::write (const Triangulation &tria, // explicit instantiations -template void GridOut::write_ucd (const Triangulation &, - std::ostream &); +template void GridOut::write_ucd<> (const Triangulation &, + std::ostream &); #if deal_II_dimension != 1 -template void GridOut::write_gnuplot (const Triangulation &, - std::ostream &, - const Mapping *); -template void GridOut::write_eps (const Triangulation &, - std::ostream &, - const Mapping *); +template void GridOut::write_gnuplot<> (const Triangulation &, + std::ostream &, + const Mapping *); +template void GridOut::write_eps<> (const Triangulation &, + std::ostream &, + const Mapping *); #endif -template void GridOut::write (const Triangulation &, - std::ostream &, - const OutputFormat, - const Mapping *); +template void GridOut::write<> (const Triangulation &, + std::ostream &, + const OutputFormat, + const Mapping *); diff --git a/deal.II/deal.II/source/grid/grid_refinement.cc b/deal.II/deal.II/source/grid/grid_refinement.cc index f273660f08..14c369f3b8 100644 --- a/deal.II/deal.II/source/grid/grid_refinement.cc +++ b/deal.II/deal.II/source/grid/grid_refinement.cc @@ -319,46 +319,46 @@ GridRefinement::refine_and_coarsen_optimize (Triangulation &tria, // explicit instantiations template void GridRefinement -::refine (Triangulation &, const Vector &, const double); +::refine<> (Triangulation &, const Vector &, const double); template void GridRefinement -::refine (Triangulation &, const Vector &, const double); +::refine<> (Triangulation &, const Vector &, const double); template void GridRefinement -::coarsen (Triangulation &, const Vector &, const double); +::coarsen<> (Triangulation &, const Vector &, const double); template void GridRefinement -::coarsen (Triangulation &, const Vector &, const double); +::coarsen<> (Triangulation &, const Vector &, const double); template void GridRefinement -::refine_and_coarsen_fixed_number (Triangulation &, - const Vector &, - const double top_fraction, - const double bottom_fraction); - -template void GridRefinement -::refine_and_coarsen_fixed_number (Triangulation &, - const Vector &criteria, - const double top_fraction, - const double bottom_fraction); - -template void GridRefinement -::refine_and_coarsen_fixed_fraction (Triangulation &, - const Vector &criteria, +::refine_and_coarsen_fixed_number<> (Triangulation &, + const Vector &, const double top_fraction, const double bottom_fraction); template void GridRefinement -::refine_and_coarsen_fixed_fraction (Triangulation &, +::refine_and_coarsen_fixed_number<> (Triangulation &, const Vector &criteria, const double top_fraction, const double bottom_fraction); template void GridRefinement -::refine_and_coarsen_optimize (Triangulation &, - const Vector &criteria); +::refine_and_coarsen_fixed_fraction<> (Triangulation &, + const Vector &criteria, + const double top_fraction, + const double bottom_fraction); + +template void GridRefinement +::refine_and_coarsen_fixed_fraction<> (Triangulation &, + const Vector &criteria, + const double top_fraction, + const double bottom_fraction); + +template void GridRefinement +::refine_and_coarsen_optimize<> (Triangulation &, + const Vector &criteria); template void GridRefinement -::refine_and_coarsen_optimize (Triangulation &, - const Vector &criteria); +::refine_and_coarsen_optimize<> (Triangulation &, + const Vector &criteria); diff --git a/deal.II/deal.II/source/grid/grid_reordering.cc b/deal.II/deal.II/source/grid/grid_reordering.cc index cae5e07256..b109843468 100644 --- a/deal.II/deal.II/source/grid/grid_reordering.cc +++ b/deal.II/deal.II/source/grid/grid_reordering.cc @@ -1314,5 +1314,5 @@ void GridReordering<1>::reorder_cells (std::vector > &) template void GridReordering:: -reorder_cells (std::vector > &); +reorder_cells<> (std::vector > &); #endif diff --git a/deal.II/deal.II/source/grid/grid_tools.cc b/deal.II/deal.II/source/grid/grid_tools.cc index bdd93bb805..d50e6cd6fc 100644 --- a/deal.II/deal.II/source/grid/grid_tools.cc +++ b/deal.II/deal.II/source/grid/grid_tools.cc @@ -96,5 +96,5 @@ GridTools::diameter (const Triangulation<1> &tria) #if deal_II_dimension != 1 template double -GridTools::diameter (const Triangulation &); +GridTools::diameter<> (const Triangulation &); #endif diff --git a/deal.II/deal.II/source/multigrid/mg_dof_tools.cc b/deal.II/deal.II/source/multigrid/mg_dof_tools.cc index db372b5ffd..f1886de104 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_tools.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_tools.cc @@ -403,152 +403,152 @@ MGTools::reinit_vector (const MGDoFHandler& mg_dof, // explicit instantiations template void -MGTools::make_sparsity_pattern (const MGDoFHandler &, - SparsityPattern &, - const unsigned int); +MGTools::make_sparsity_pattern<> (const MGDoFHandler &, + SparsityPattern &, + const unsigned int); template void -MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, - SparsityPattern &, - const unsigned int); +MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, + SparsityPattern &, + const unsigned int); template void -MGTools::make_flux_sparsity_pattern_edge (const MGDoFHandler &, - SparsityPattern &, - const unsigned int); +MGTools::make_flux_sparsity_pattern_edge<> (const MGDoFHandler &, + SparsityPattern &, + const unsigned int); template void -MGTools::make_sparsity_pattern (const MGDoFHandler &, - CompressedSparsityPattern &, - const unsigned int); +MGTools::make_sparsity_pattern<> (const MGDoFHandler &, + CompressedSparsityPattern &, + const unsigned int); template void -MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, - CompressedSparsityPattern &, - const unsigned int); +MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, + CompressedSparsityPattern &, + const unsigned int); template void -MGTools::make_flux_sparsity_pattern_edge (const MGDoFHandler &, - CompressedSparsityPattern &, - const unsigned int); +MGTools::make_flux_sparsity_pattern_edge<> (const MGDoFHandler &, + CompressedSparsityPattern &, + const unsigned int); template void -MGTools::make_sparsity_pattern (const MGDoFHandler &, - BlockSparsityPattern &, - const unsigned int); +MGTools::make_sparsity_pattern<> (const MGDoFHandler &, + BlockSparsityPattern &, + const unsigned int); template void -MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, - BlockSparsityPattern &, - const unsigned int); +MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, + BlockSparsityPattern &, + const unsigned int); template void -MGTools::make_flux_sparsity_pattern_edge (const MGDoFHandler &, - BlockSparsityPattern &, - const unsigned int); +MGTools::make_flux_sparsity_pattern_edge<> (const MGDoFHandler &, + BlockSparsityPattern &, + const unsigned int); template void -MGTools::make_sparsity_pattern (const MGDoFHandler &, - CompressedBlockSparsityPattern &, - const unsigned int); +MGTools::make_sparsity_pattern<> (const MGDoFHandler &, + CompressedBlockSparsityPattern &, + const unsigned int); template void -MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, - CompressedBlockSparsityPattern &, - const unsigned int); +MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, + CompressedBlockSparsityPattern &, + const unsigned int); template void -MGTools::make_flux_sparsity_pattern_edge (const MGDoFHandler &, - CompressedBlockSparsityPattern &, - const unsigned int); +MGTools::make_flux_sparsity_pattern_edge<> (const MGDoFHandler &, + CompressedBlockSparsityPattern &, + const unsigned int); #if deal_II_dimension > 1 template void -MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, - SparsityPattern &, - const unsigned int, - const FullMatrix&, - const FullMatrix&); +MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, + SparsityPattern &, + const unsigned int, + const FullMatrix&, + const FullMatrix&); template void -MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, - CompressedSparsityPattern &, - const unsigned int, - const FullMatrix&, - const FullMatrix&); +MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, + CompressedSparsityPattern &, + const unsigned int, + const FullMatrix&, + const FullMatrix&); template void -MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, - BlockSparsityPattern &, - const unsigned int, - const FullMatrix&, - const FullMatrix&); +MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, + BlockSparsityPattern &, + const unsigned int, + const FullMatrix&, + const FullMatrix&); template void -MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, - CompressedBlockSparsityPattern &, - const unsigned int, - const FullMatrix&, - const FullMatrix&); +MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, + CompressedBlockSparsityPattern &, + const unsigned int, + const FullMatrix&, + const FullMatrix&); #endif -template void MGTools::reinit_vector (const MGDoFHandler&, - MGLevelObject >&); -template void MGTools::reinit_vector (const MGDoFHandler&, - MGLevelObject >&); +template void MGTools::reinit_vector<> (const MGDoFHandler&, + MGLevelObject >&); +template void MGTools::reinit_vector<> (const MGDoFHandler&, + MGLevelObject >&); -// template void MGTools::copy_to_mg (const MGDoFHandler&, +// template void MGTools::copy_to_mg<> (const MGDoFHandler&, // const MGTransferBase >&, // MGLevelObject >&, // const Vector&); -// template void MGTools::copy_from_mg(const MGDoFHandler&, +// template void MGTools::copy_from_mg<>(const MGDoFHandler&, // Vector&, // const MGLevelObject >&); -// template void MGTools::copy_from_mg_add(const MGDoFHandler&, +// template void MGTools::copy_from_mg_add<>(const MGDoFHandler&, // Vector&, // const MGLevelObject >&); -// template void MGTools::copy_to_mg (const MGDoFHandler&, +// template void MGTools::copy_to_mg<> (const MGDoFHandler&, // const MGTransferBase >&, // MGLevelObject >&, // const Vector&); -// template void MGTools::copy_from_mg(const MGDoFHandler&, +// template void MGTools::copy_from_mg<>(const MGDoFHandler&, // Vector&, // const MGLevelObject >&); -// template void MGTools::copy_from_mg_add(const MGDoFHandler&, +// template void MGTools::copy_from_mg_add<>(const MGDoFHandler&, // Vector&, // const MGLevelObject >&); -// template void MGTools::copy_to_mg (const MGDoFHandler&, +// template void MGTools::copy_to_mg<> (const MGDoFHandler&, // const MGTransferBase >&, // MGLevelObject >&, // const BlockVector&); -// template void MGTools::copy_from_mg(const MGDoFHandler&, +// template void MGTools::copy_from_mg<>(const MGDoFHandler&, // BlockVector&, // const MGLevelObject >&); -// template void MGTools::copy_from_mg_add(const MGDoFHandler&, +// template void MGTools::copy_from_mg_add<>(const MGDoFHandler&, // BlockVector&, // const MGLevelObject >&); -// template void MGTools::copy_to_mg (const MGDoFHandler&, +// template void MGTools::copy_to_mg<> (const MGDoFHandler&, // const MGTransferBase >&, // MGLevelObject >&, // const BlockVector&); -// template void MGTools::copy_from_mg(const MGDoFHandler&, +// template void MGTools::copy_from_mg<>(const MGDoFHandler&, // BlockVector&, // const MGLevelObject >&); -// template void MGTools::copy_from_mg_add(const MGDoFHandler&, +// template void MGTools::copy_from_mg_add<>(const MGDoFHandler&, // BlockVector&, // const MGLevelObject >&); -template void MGTools::count_dofs_per_component (const MGDoFHandler&, - std::vector >&); +template void MGTools::count_dofs_per_component<> (const MGDoFHandler&, + std::vector >&); diff --git a/deal.II/deal.II/source/multigrid/mg_smoother.cc b/deal.II/deal.II/source/multigrid/mg_smoother.cc index 85bfd978bc..d0b822535d 100644 --- a/deal.II/deal.II/source/multigrid/mg_smoother.cc +++ b/deal.II/deal.II/source/multigrid/mg_smoother.cc @@ -36,7 +36,7 @@ #if deal_II_dimension == 1 MGSmootherContinuous::MGSmootherContinuous (const MGDoFHandler<1> &/*mg_dof*/, - unsigned int steps) + const unsigned int steps) : steps(steps) { @@ -50,7 +50,7 @@ MGSmootherContinuous::MGSmootherContinuous (const MGDoFHandler<1> &/*mg_dof*/, template MGSmootherContinuous::MGSmootherContinuous (const MGDoFHandler &mg_dof, - unsigned int steps) + const unsigned int steps) : steps(steps) { @@ -133,24 +133,25 @@ MGSmootherContinuous::set_zero_interior_boundary (const unsigned int level, // don't do the following instantiation in 1d, since there is a specialized // function there #if deal_II_dimension > 1 -template MGSmootherContinuous::MGSmootherContinuous (const MGDoFHandler&, unsigned int); +template MGSmootherContinuous::MGSmootherContinuous (const MGDoFHandler&, + const unsigned int); #endif template -void MGSmootherContinuous::set_zero_interior_boundary (const unsigned int, - Vector&) const; +void MGSmootherContinuous::set_zero_interior_boundary<> (const unsigned int, + Vector&) const; template -void MGSmootherContinuous::set_zero_interior_boundary (const unsigned int, - Vector&) const; +void MGSmootherContinuous::set_zero_interior_boundary<> (const unsigned int, + Vector&) const; template -void MGSmootherContinuous::set_zero_interior_boundary (const unsigned int, - BlockVector&) const; +void MGSmootherContinuous::set_zero_interior_boundary<> (const unsigned int, + BlockVector&) const; template -void MGSmootherContinuous::set_zero_interior_boundary (const unsigned int, - BlockVector&) const; +void MGSmootherContinuous::set_zero_interior_boundary<> (const unsigned int, + BlockVector&) const; diff --git a/deal.II/deal.II/source/multigrid/multigrid.cc b/deal.II/deal.II/source/multigrid/multigrid.cc index f00b190617..cc65bc9e1c 100644 --- a/deal.II/deal.II/source/multigrid/multigrid.cc +++ b/deal.II/deal.II/source/multigrid/multigrid.cc @@ -331,12 +331,12 @@ void MGTransferSelect::build_matrices (const MGDoFHandler &mg_dof, // explicit instatations template -void MGTransferPrebuilt::build_matrices (const MGDoFHandler &mg_dof); +void MGTransferPrebuilt::build_matrices<> (const MGDoFHandler &mg_dof); template -void MGTransferBlock::build_matrices (const MGDoFHandler &mg_dof, - std::vector); +void MGTransferBlock::build_matrices<> (const MGDoFHandler &mg_dof, + std::vector); template -void MGTransferSelect::build_matrices (const MGDoFHandler &mg_dof, - unsigned int); +void MGTransferSelect::build_matrices<> (const MGDoFHandler &mg_dof, + unsigned int); diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index b000032938..790e31e676 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -643,44 +643,44 @@ DataOut::next_cell (const typename DoFHandler::cell_iterator &cell) // explicit instantiations template class DataOut_DoFData; template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const Vector &vec, const std::vector &name, const DataVectorType type); template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const BlockVector &vec, const std::vector &name, const DataVectorType type); template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const Vector &vec, const std::string &name, const DataVectorType type); template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const BlockVector &vec, const std::string &name, const DataVectorType type); template class DataOut_DoFData; template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const Vector &vec, const std::vector &name, const DataVectorType type); template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const BlockVector &vec, const std::vector &name, const DataVectorType type); template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const Vector &vec, const std::string &name, const DataVectorType type); template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const BlockVector &vec, const std::string &name, const DataVectorType type); @@ -693,22 +693,22 @@ template class DataOut; #if deal_II_dimension >= 2 template class DataOut_DoFData; template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const Vector &vec, const std::vector &name, const DataVectorType type); template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const BlockVector &vec, const std::vector &name, const DataVectorType type); template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const Vector &vec, const std::string &name, const DataVectorType type); template void -DataOut_DoFData::add_data_vector ( +DataOut_DoFData::add_data_vector<> ( const BlockVector &vec, const std::string &name, const DataVectorType type); diff --git a/deal.II/deal.II/source/numerics/data_out_stack.cc b/deal.II/deal.II/source/numerics/data_out_stack.cc index b5a3359e09..9803737990 100644 --- a/deal.II/deal.II/source/numerics/data_out_stack.cc +++ b/deal.II/deal.II/source/numerics/data_out_stack.cc @@ -380,7 +380,7 @@ std::vector DataOutStack::get_dataset_names () const // explicit instantiations template class DataOutStack; -template void DataOutStack::add_data_vector (const Vector &vec, - const std::string &name); -template void DataOutStack::add_data_vector (const Vector &vec, - const std::string &name); +template void DataOutStack::add_data_vector<> (const Vector &vec, + const std::string &name); +template void DataOutStack::add_data_vector<> (const Vector &vec, + const std::string &name); diff --git a/deal.II/deal.II/source/numerics/derivative_approximation.cc b/deal.II/deal.II/source/numerics/derivative_approximation.cc index bc6707914e..3467d67424 100644 --- a/deal.II/deal.II/source/numerics/derivative_approximation.cc +++ b/deal.II/deal.II/source/numerics/derivative_approximation.cc @@ -713,31 +713,31 @@ DerivativeApproximation::approximate (const Mapping &mapping, template void DerivativeApproximation:: -approximate_gradient (const Mapping &mapping, - const DoFHandler &dof_handler, - const Vector &solution, - Vector &derivative_norm, - const unsigned int component); +approximate_gradient<> (const Mapping &mapping, + const DoFHandler &dof_handler, + const Vector &solution, + Vector &derivative_norm, + const unsigned int component); template void DerivativeApproximation:: -approximate_gradient (const DoFHandler &dof_handler, - const Vector &solution, - Vector &derivative_norm, - const unsigned int component); +approximate_gradient<> (const DoFHandler &dof_handler, + const Vector &solution, + Vector &derivative_norm, + const unsigned int component); template void DerivativeApproximation:: -approximate_second_derivative (const Mapping &mapping, - const DoFHandler &dof_handler, - const Vector &solution, - Vector &derivative_norm, - const unsigned int component); +approximate_second_derivative<> (const Mapping &mapping, + const DoFHandler &dof_handler, + const Vector &solution, + Vector &derivative_norm, + const unsigned int component); template void DerivativeApproximation:: -approximate_second_derivative (const DoFHandler &dof_handler, - const Vector &solution, - Vector &derivative_norm, - const unsigned int component); +approximate_second_derivative<> (const DoFHandler &dof_handler, + const Vector &solution, + Vector &derivative_norm, + const unsigned int component); diff --git a/deal.II/deal.II/source/numerics/histogram.cc b/deal.II/deal.II/source/numerics/histogram.cc index 8c5638d120..cc75cd980e 100644 --- a/deal.II/deal.II/source/numerics/histogram.cc +++ b/deal.II/deal.II/source/numerics/histogram.cc @@ -329,23 +329,23 @@ Histogram::memory_consumption () const // explicit instantiations for float template -void Histogram::evaluate (const std::vector > &values, - const std::vector &y_values, - const unsigned int n_intervals, - const IntervalSpacing interval_spacing); +void Histogram::evaluate<> (const std::vector > &values, + const std::vector &y_values, + const unsigned int n_intervals, + const IntervalSpacing interval_spacing); template -void Histogram::evaluate (const Vector &values, - const unsigned int n_intervals, - const IntervalSpacing interval_spacing); +void Histogram::evaluate<> (const Vector &values, + const unsigned int n_intervals, + const IntervalSpacing interval_spacing); // explicit instantiations for double template -void Histogram::evaluate (const std::vector > &values, - const std::vector &y_values, - const unsigned int n_intervals, - const IntervalSpacing interval_spacing); +void Histogram::evaluate<> (const std::vector > &values, + const std::vector &y_values, + const unsigned int n_intervals, + const IntervalSpacing interval_spacing); template -void Histogram::evaluate (const Vector &values, - const unsigned int n_intervals, - const IntervalSpacing interval_spacing); +void Histogram::evaluate<> (const Vector &values, + const unsigned int n_intervals, + const IntervalSpacing interval_spacing); diff --git a/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc b/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc index 540cb00c95..307da1e91c 100644 --- a/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc +++ b/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc @@ -511,15 +511,15 @@ MatrixTools::apply_boundary_values (const std::map &boundar template void -MatrixTools::apply_boundary_values (const std::map &boundary_values, - SparseMatrix &matrix, - Vector &solution, - Vector &right_hand_side, - const bool preserve_symmetry); +MatrixTools::apply_boundary_values<> (const std::map &boundary_values, + SparseMatrix &matrix, + Vector &solution, + Vector &right_hand_side, + const bool preserve_symmetry); template void -MatrixTools::apply_boundary_values (const std::map &boundary_values, - SparseMatrix &matrix, - Vector &solution, - Vector &right_hand_side, - const bool preserve_symmetry); +MatrixTools::apply_boundary_values<> (const std::map &boundary_values, + SparseMatrix &matrix, + Vector &solution, + Vector &right_hand_side, + const bool preserve_symmetry); diff --git a/deal.II/deal.II/source/numerics/matrices.cc b/deal.II/deal.II/source/numerics/matrices.cc index 2980d77c68..5a72b0dfd8 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -1228,77 +1228,77 @@ void MatrixCreator::create_laplace_matrix (const DoFHandler &dof, // explicit instantiations template -void MatrixCreator::create_mass_matrix (const Mapping &mapping, - const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function * const coefficient); +void MatrixCreator::create_mass_matrix<> (const Mapping &mapping, + const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function * const coefficient); template -void MatrixCreator::create_mass_matrix (const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function * const coefficient); +void MatrixCreator::create_mass_matrix<> (const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function * const coefficient); template -void MatrixCreator::create_mass_matrix (const Mapping &mapping, - const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const coefficient); +void MatrixCreator::create_mass_matrix<> (const Mapping &mapping, + const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const coefficient); template -void MatrixCreator::create_mass_matrix (const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const coefficient); +void MatrixCreator::create_mass_matrix<> (const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const coefficient); #if deal_II_dimension != 1 template void -MatrixCreator::create_boundary_mass_matrix (const Mapping &mapping, - const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const FunctionMap::type &boundary_functions, - Vector &rhs_vector, - std::vector &dof_to_boundary_mapping, - const Function * const a); +MatrixCreator::create_boundary_mass_matrix<> (const Mapping &mapping, + const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const FunctionMap::type &boundary_functions, + Vector &rhs_vector, + std::vector &dof_to_boundary_mapping, + const Function * const a); #endif template -void MatrixCreator::create_boundary_mass_matrix (const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const FunctionMap::type &rhs, - Vector &rhs_vector, - std::vector &dof_to_boundary_mapping, - const Function * const a); +void MatrixCreator::create_boundary_mass_matrix<> (const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const FunctionMap::type &rhs, + Vector &rhs_vector, + std::vector &dof_to_boundary_mapping, + const Function * const a); template -void MatrixCreator::create_laplace_matrix (const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function * const coefficient); +void MatrixCreator::create_laplace_matrix<> (const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function * const coefficient); template -void MatrixCreator::create_laplace_matrix (const Mapping &mapping, - const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function * const coefficient); +void MatrixCreator::create_laplace_matrix<> (const Mapping &mapping, + const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function * const coefficient); template -void MatrixCreator::create_laplace_matrix (const Mapping &mapping, - const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const coefficient); +void MatrixCreator::create_laplace_matrix<> (const Mapping &mapping, + const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const coefficient); template -void MatrixCreator::create_laplace_matrix (const DoFHandler &dof, - const Quadrature &q, - SparseMatrix &matrix, - const Function &rhs, - Vector &rhs_vector, - const Function * const coefficient); +void MatrixCreator::create_laplace_matrix<> (const DoFHandler &dof, + const Quadrature &q, + SparseMatrix &matrix, + const Function &rhs, + Vector &rhs_vector, + const Function * const coefficient); diff --git a/deal.II/deal.II/source/numerics/solution_transfer.cc b/deal.II/deal.II/source/numerics/solution_transfer.cc index 210b0b3609..120a56b6b6 100644 --- a/deal.II/deal.II/source/numerics/solution_transfer.cc +++ b/deal.II/deal.II/source/numerics/solution_transfer.cc @@ -401,4 +401,4 @@ SolutionTransfer::Pointerstruct::memory_consumption () const template class SolutionTransfer; template class SolutionTransfer; -/*---------------------------- solutiontransfer.cc ----------------------*/ +/*---------------------------- solution_transfer.cc ----------------------*/ diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index cf522ea2bb..b0228abe06 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -1460,298 +1460,298 @@ VectorTools::compute_mean_value (const DoFHandler &dof, // explicit instantiations template -void VectorTools::interpolate (const Mapping&, - const DoFHandler&, - const Function&, - Vector&); +void VectorTools::interpolate<> (const Mapping&, + const DoFHandler&, + const Function&, + Vector&); template -void VectorTools::interpolate (const DoFHandler&, - const Function&, - Vector&); +void VectorTools::interpolate<> (const DoFHandler&, + const Function&, + Vector&); template -void VectorTools::interpolate (const Mapping&, - const DoFHandler&, - const Function&, - Vector&); +void VectorTools::interpolate<> (const Mapping&, + const DoFHandler&, + const Function&, + Vector&); template -void VectorTools::interpolate (const DoFHandler&, - const Function&, - Vector&); +void VectorTools::interpolate<> (const DoFHandler&, + const Function&, + Vector&); template -void VectorTools::interpolate (const Mapping&, - const DoFHandler&, - const Function&, - BlockVector&); +void VectorTools::interpolate<> (const Mapping&, + const DoFHandler&, + const Function&, + BlockVector&); template -void VectorTools::interpolate (const DoFHandler&, - const Function&, - BlockVector&); +void VectorTools::interpolate<> (const DoFHandler&, + const Function&, + BlockVector&); template -void VectorTools::interpolate (const Mapping&, - const DoFHandler&, - const Function&, - BlockVector&); +void VectorTools::interpolate<> (const Mapping&, + const DoFHandler&, + const Function&, + BlockVector&); template -void VectorTools::interpolate (const DoFHandler&, - const Function&, - BlockVector&); +void VectorTools::interpolate<> (const DoFHandler&, + const Function&, + BlockVector&); template -void VectorTools::interpolate(const DoFHandler&, - const DoFHandler&, - const FullMatrix&, - const Vector&, - Vector&); +void VectorTools::interpolate<>(const DoFHandler&, + const DoFHandler&, + const FullMatrix&, + const Vector&, + Vector&); template -void VectorTools::interpolate(const DoFHandler&, - const DoFHandler&, - const FullMatrix&, - const BlockVector&, - BlockVector&); +void VectorTools::interpolate<>(const DoFHandler&, + const DoFHandler&, + const FullMatrix&, + const BlockVector&, + BlockVector&); template -void VectorTools::project (const DoFHandler &, - const ConstraintMatrix &, - const Quadrature &, - const Function &, - Vector &, - const bool, - const Quadrature &, - const bool); +void VectorTools::project<> (const DoFHandler &, + const ConstraintMatrix &, + const Quadrature &, + const Function &, + Vector &, + const bool, + const Quadrature &, + const bool); template -void VectorTools::create_right_hand_side (const Mapping &, - const DoFHandler &, - const Quadrature &, - const Function &, - Vector &); +void VectorTools::create_right_hand_side<> (const Mapping &, + const DoFHandler &, + const Quadrature &, + const Function &, + Vector &); template -void VectorTools::create_right_hand_side (const DoFHandler &, - const Quadrature &, - const Function &, - Vector &); +void VectorTools::create_right_hand_side<> (const DoFHandler &, + const Quadrature &, + const Function &, + Vector &); #if deal_II_dimension != 1 template void -VectorTools::create_boundary_right_hand_side (const Mapping &, - const DoFHandler &, - const Quadrature &, - const Function &, - Vector &, - const std::set &); +VectorTools::create_boundary_right_hand_side<> (const Mapping &, + const DoFHandler &, + const Quadrature &, + const Function &, + Vector &, + const std::set &); #endif template void -VectorTools::create_boundary_right_hand_side (const DoFHandler &, - const Quadrature &, - const Function &, - Vector &, - const std::set &); +VectorTools::create_boundary_right_hand_side<> (const DoFHandler &, + const Quadrature &, + const Function &, + Vector &, + const std::set &); template -void VectorTools::interpolate_boundary_values (const DoFHandler &, - const unsigned char, - const Function &, - std::map &, - const std::vector &); +void VectorTools::interpolate_boundary_values<> (const DoFHandler &, + const unsigned char, + const Function &, + std::map &, + const std::vector &); template -void VectorTools::integrate_difference (const Mapping &, - const DoFHandler &, - const Vector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const Mapping &, + const DoFHandler &, + const Vector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const DoFHandler &, - const Vector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const DoFHandler &, + const Vector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const Mapping &, - const DoFHandler &, - const Vector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const Mapping &, + const DoFHandler &, + const Vector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const DoFHandler &, - const Vector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const DoFHandler &, + const Vector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const Mapping &, - const DoFHandler &, - const Vector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const Mapping &, + const DoFHandler &, + const Vector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const DoFHandler &, - const Vector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const DoFHandler &, + const Vector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const Mapping &, - const DoFHandler &, - const Vector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const Mapping &, + const DoFHandler &, + const Vector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const DoFHandler &, - const Vector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const DoFHandler &, + const Vector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const Mapping &, - const DoFHandler &, - const BlockVector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const Mapping &, + const DoFHandler &, + const BlockVector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const DoFHandler &, - const BlockVector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const DoFHandler &, + const BlockVector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const Mapping &, - const DoFHandler &, - const BlockVector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const Mapping &, + const DoFHandler &, + const BlockVector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const DoFHandler &, - const BlockVector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const DoFHandler &, + const BlockVector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const Mapping &, - const DoFHandler &, - const BlockVector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const Mapping &, + const DoFHandler &, + const BlockVector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const DoFHandler &, - const BlockVector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const DoFHandler &, + const BlockVector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const Mapping &, - const DoFHandler &, - const BlockVector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const Mapping &, + const DoFHandler &, + const BlockVector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); template -void VectorTools::integrate_difference (const DoFHandler &, - const BlockVector &, - const Function &, - Vector &, - const Quadrature &, - const NormType &, - const Function *); +void VectorTools::integrate_difference<> (const DoFHandler &, + const BlockVector &, + const Function &, + Vector &, + const Quadrature &, + const NormType &, + const Function *); #if deal_II_dimension != 1 template -void VectorTools::project_boundary_values (const Mapping &, - const DoFHandler &, - const FunctionMap::type &, - const Quadrature&, - std::map &); +void VectorTools::project_boundary_values<> (const Mapping &, + const DoFHandler &, + const FunctionMap::type &, + const Quadrature&, + std::map &); #endif template -void VectorTools::project_boundary_values (const DoFHandler &, - const FunctionMap::type &, - const Quadrature&, - std::map &); +void VectorTools::project_boundary_values<> (const DoFHandler &, + const FunctionMap::type &, + const Quadrature&, + std::map &); template -double VectorTools::compute_mean_value (const Mapping&, - const DoFHandler&, - const Quadrature&, - const Vector&, - const unsigned int); +double VectorTools::compute_mean_value<> (const Mapping&, + const DoFHandler&, + const Quadrature&, + const Vector&, + const unsigned int); template -double VectorTools::compute_mean_value (const DoFHandler&, - const Quadrature&, - const Vector&, - const unsigned int); +double VectorTools::compute_mean_value<> (const DoFHandler&, + const Quadrature&, + const Vector&, + const unsigned int); template -double VectorTools::compute_mean_value (const Mapping&, - const DoFHandler&, - const Quadrature&, - const BlockVector&, - const unsigned int); +double VectorTools::compute_mean_value<> (const Mapping&, + const DoFHandler&, + const Quadrature&, + const BlockVector&, + const unsigned int); template -double VectorTools::compute_mean_value (const DoFHandler&, - const Quadrature&, - const BlockVector&, - const unsigned int); +double VectorTools::compute_mean_value<> (const DoFHandler&, + const Quadrature&, + const BlockVector&, + const unsigned int); template -double VectorTools::compute_mean_value (const Mapping&, - const DoFHandler&, - const Quadrature&, - const Vector&, - const unsigned int); +double VectorTools::compute_mean_value<> (const Mapping&, + const DoFHandler&, + const Quadrature&, + const Vector&, + const unsigned int); template -double VectorTools::compute_mean_value (const DoFHandler&, - const Quadrature&, - const Vector&, - const unsigned int); +double VectorTools::compute_mean_value<> (const DoFHandler&, + const Quadrature&, + const Vector&, + const unsigned int); template -double VectorTools::compute_mean_value (const Mapping&, - const DoFHandler&, - const Quadrature&, - const BlockVector&, - const unsigned int); +double VectorTools::compute_mean_value<> (const Mapping&, + const DoFHandler&, + const Quadrature&, + const BlockVector&, + const unsigned int); template -double VectorTools::compute_mean_value (const DoFHandler&, - const Quadrature&, - const BlockVector&, - const unsigned int); +double VectorTools::compute_mean_value<> (const DoFHandler&, + const Quadrature&, + const BlockVector&, + const unsigned int); @@ -1759,20 +1759,20 @@ double VectorTools::compute_mean_value (const DoFHandler&, // and thus need no explicit instantiation #if deal_II_dimension > 1 template -void VectorTools::interpolate_boundary_values (const Mapping &, - const DoFHandler &, - const unsigned char, - const Function &, - std::map &, - const std::vector &); +void VectorTools::interpolate_boundary_values<> (const Mapping &, + const DoFHandler &, + const unsigned char, + const Function &, + std::map &, + const std::vector &); template -void VectorTools::project (const Mapping &, - const DoFHandler &, - const ConstraintMatrix &, - const Quadrature &, - const Function &, - Vector &, - const bool, - const Quadrature &, - const bool); +void VectorTools::project<> (const Mapping &, + const DoFHandler &, + const ConstraintMatrix &, + const Quadrature &, + const Function &, + Vector &, + const bool, + const Quadrature &, + const bool); #endif diff --git a/deal.II/doc/news/2002/c-3-3.html b/deal.II/doc/news/2002/c-3-3.html index 4bbaba98a8..65704b9169 100644 --- a/deal.II/doc/news/2002/c-3-3.html +++ b/deal.II/doc/news/2002/c-3-3.html @@ -33,6 +33,15 @@ contributor's names are abbreviated by WB (Wolfgang Bangerth), GK

General

    +

  1. + Fixed: Explicit specializations of member templates are now + conforming to the C++ standard. While most compilers accepted + the previous form, Sun's Forte compiler wants a strictly + conforming one. +
    + (WB 2002/03/25) +

    +

  2. Fixed: For gcc versions that used ostrstream instead of ; -template BlockVector& BlockVector::operator=( +template BlockVector& BlockVector::template operator=<>( const BlockVector&); -template void BlockVector::reinit(const BlockVector&, const bool); -template void BlockVector::reinit(const BlockVector&, const bool); -template void BlockVector::equ(const double, const BlockVector&); -template void BlockVector::equ(const double, const BlockVector&); +template void BlockVector::reinit<>(const BlockVector&, const bool); +template void BlockVector::reinit<>(const BlockVector&, const bool); +template void BlockVector::equ<>(const double, const BlockVector&); +template void BlockVector::equ<>(const double, const BlockVector&); template class BlockVector; -template BlockVector& BlockVector::operator=( +template BlockVector& BlockVector::template operator=<>( const BlockVector&); -template void BlockVector::reinit(const BlockVector&, const bool); -template void BlockVector::reinit(const BlockVector&, const bool); -template void BlockVector::equ(const float, const BlockVector&); -template void BlockVector::equ(const float, const BlockVector&); +template void BlockVector::reinit<>(const BlockVector&, const bool); +template void BlockVector::reinit<>(const BlockVector&, const bool); +template void BlockVector::equ<>(const float, const BlockVector&); +template void BlockVector::equ<>(const float, const BlockVector&); namespace BlockVectorIterators { diff --git a/deal.II/lac/source/full_matrix.double.cc b/deal.II/lac/source/full_matrix.double.cc index 940b5a5f3a..fbae87cb73 100644 --- a/deal.II/lac/source/full_matrix.double.cc +++ b/deal.II/lac/source/full_matrix.double.cc @@ -22,62 +22,62 @@ template class FullMatrix; #define TYPEMAT2 double //template FullMatrix& FullMatrix::operator =(const FullMatrix&); -template void FullMatrix::fill (const FullMatrix&, const unsigned, const unsigned); -template void FullMatrix::add (const TYPEMAT, const FullMatrix&); -template void FullMatrix::Tadd (const TYPEMAT, const FullMatrix&); -template void FullMatrix::mmult (FullMatrix&, const FullMatrix&, const bool) const; -template void FullMatrix::Tmmult (FullMatrix&, const FullMatrix&, const bool) const; -template void FullMatrix::add_diag (const TYPEMAT, const FullMatrix&); -template void FullMatrix::invert (const FullMatrix&); +template void FullMatrix::fill<> (const FullMatrix&, const unsigned, const unsigned); +template void FullMatrix::add<> (const TYPEMAT, const FullMatrix&); +template void FullMatrix::Tadd<> (const TYPEMAT, const FullMatrix&); +template void FullMatrix::mmult<> (FullMatrix&, const FullMatrix&, const bool) const; +template void FullMatrix::Tmmult<> (FullMatrix&, const FullMatrix&, const bool) const; +template void FullMatrix::add_diag<> (const TYPEMAT, const FullMatrix&); +template void FullMatrix::invert<> (const FullMatrix&); #define TYPEVEC double #define TYPERES double -template void FullMatrix::fill_permutation (const FullMatrix&, - const std::vector&, - const std::vector&); -template void FullMatrix::vmult(Vector&, const Vector&, const bool) const; -template void FullMatrix::Tvmult(Vector&, const Vector&, const bool) const; -template double FullMatrix::residual(Vector&, const Vector&, const Vector&) const; -template TYPEVEC FullMatrix::matrix_norm_square (const Vector &) const; -template TYPEVEC FullMatrix::matrix_scalar_product(const Vector&, const Vector&) const; -template void FullMatrix::forward(Vector&, const Vector&) const; -template void FullMatrix::backward(Vector&, const Vector&) const; -template void FullMatrix::householder(Vector&); -template double FullMatrix::least_squares(Vector&, Vector&); +template void FullMatrix::fill_permutation<> (const FullMatrix&, + const std::vector&, + const std::vector&); +template void FullMatrix::vmult<>(Vector&, const Vector&, const bool) const; +template void FullMatrix::Tvmult<>(Vector&, const Vector&, const bool) const; +template double FullMatrix::residual<>(Vector&, const Vector&, const Vector&) const; +template TYPEVEC FullMatrix::matrix_norm_square<> (const Vector &) const; +template TYPEVEC FullMatrix::matrix_scalar_product<>(const Vector&, const Vector&) const; +template void FullMatrix::forward<>(Vector&, const Vector&) const; +template void FullMatrix::backward<>(Vector&, const Vector&) const; +template void FullMatrix::householder<>(Vector&); +template double FullMatrix::least_squares<>(Vector&, Vector&); template -void FullMatrix::precondition_Jacobi (Vector &, - const Vector &, - const TYPEMAT) const; +void FullMatrix::precondition_Jacobi<> (Vector &, + const Vector &, + const TYPEMAT) const; #undef TYPEVEC #define TYPEVEC float -template void FullMatrix::fill_permutation (const FullMatrix&, - const std::vector&, - const std::vector&); -template void FullMatrix::vmult(Vector&, const Vector&, const bool) const; -template void FullMatrix::Tvmult(Vector&, const Vector&, const bool) const; -template double FullMatrix::residual(Vector&, const Vector&, const Vector&) const; -template TYPEVEC FullMatrix::matrix_norm_square (const Vector &) const; -template TYPEVEC FullMatrix::matrix_scalar_product(const Vector&, const Vector&) const; -template void FullMatrix::forward(Vector&, const Vector&) const; -template void FullMatrix::backward(Vector&, const Vector&) const; -template void FullMatrix::householder(Vector&); -template double FullMatrix::least_squares(Vector&, Vector&); +template void FullMatrix::fill_permutation<> (const FullMatrix&, + const std::vector&, + const std::vector&); +template void FullMatrix::vmult<>(Vector&, const Vector&, const bool) const; +template void FullMatrix::Tvmult<>(Vector&, const Vector&, const bool) const; +template double FullMatrix::residual<>(Vector&, const Vector&, const Vector&) const; +template TYPEVEC FullMatrix::matrix_norm_square<> (const Vector &) const; +template TYPEVEC FullMatrix::matrix_scalar_product<>(const Vector&, const Vector&) const; +template void FullMatrix::forward<>(Vector&, const Vector&) const; +template void FullMatrix::backward<>(Vector&, const Vector&) const; +template void FullMatrix::householder<>(Vector&); +template double FullMatrix::least_squares<>(Vector&, Vector&); template -void FullMatrix::precondition_Jacobi (Vector &, - const Vector &, - const TYPEMAT) const; +void FullMatrix::precondition_Jacobi<> (Vector &, + const Vector &, + const TYPEMAT) const; #undef TYPERES #define TYPERES float -template double FullMatrix::residual(Vector&, const Vector&, const Vector&) const; +template double FullMatrix::residual<>(Vector&, const Vector&, const Vector&) const; // Experimental code diff --git a/deal.II/lac/source/full_matrix.float.cc b/deal.II/lac/source/full_matrix.float.cc index b8a2128031..b33d535478 100644 --- a/deal.II/lac/source/full_matrix.float.cc +++ b/deal.II/lac/source/full_matrix.float.cc @@ -20,57 +20,57 @@ template class FullMatrix; #define TYPEMAT2 float -//template FullMatrix& FullMatrix::operator =(const FullMatrix&); -template void FullMatrix::fill (const FullMatrix&, const unsigned, const unsigned); -template void FullMatrix::add (const TYPEMAT, const FullMatrix&); -template void FullMatrix::Tadd (const TYPEMAT, const FullMatrix&); -template void FullMatrix::mmult (FullMatrix&, const FullMatrix&, const bool) const; -template void FullMatrix::Tmmult (FullMatrix&, const FullMatrix&, const bool) const; -template void FullMatrix::add_diag (const TYPEMAT, const FullMatrix&); -template void FullMatrix::invert (const FullMatrix&); +//template FullMatrix& FullMatrix::operator =<>(const FullMatrix&); +template void FullMatrix::fill<> (const FullMatrix&, const unsigned, const unsigned); +template void FullMatrix::add<> (const TYPEMAT, const FullMatrix&); +template void FullMatrix::Tadd<> (const TYPEMAT, const FullMatrix&); +template void FullMatrix::mmult<> (FullMatrix&, const FullMatrix&, const bool) const; +template void FullMatrix::Tmmult<> (FullMatrix&, const FullMatrix&, const bool) const; +template void FullMatrix::add_diag<> (const TYPEMAT, const FullMatrix&); +template void FullMatrix::invert<> (const FullMatrix&); #define TYPEVEC double #define TYPERES double -template void FullMatrix::fill_permutation (const FullMatrix&, - const std::vector&, - const std::vector&); -template void FullMatrix::vmult(Vector&, const Vector&, const bool) const; -template void FullMatrix::Tvmult(Vector&, const Vector&, const bool) const; -template double FullMatrix::residual(Vector&, const Vector&, const Vector&) const; -template TYPEVEC FullMatrix::matrix_norm_square (const Vector &) const; -template TYPEVEC FullMatrix::matrix_scalar_product(const Vector&, const Vector&) const; -template void FullMatrix::forward(Vector&, const Vector&) const; -template void FullMatrix::backward(Vector&, const Vector&) const; -template void FullMatrix::householder(Vector&); -template double FullMatrix::least_squares(Vector&, Vector&); +template void FullMatrix::fill_permutation<> (const FullMatrix&, + const std::vector&, + const std::vector&); +template void FullMatrix::vmult<>(Vector&, const Vector&, const bool) const; +template void FullMatrix::Tvmult<>(Vector&, const Vector&, const bool) const; +template double FullMatrix::residual<>(Vector&, const Vector&, const Vector&) const; +template TYPEVEC FullMatrix::matrix_norm_square<> (const Vector &) const; +template TYPEVEC FullMatrix::matrix_scalar_product<>(const Vector&, const Vector&) const; +template void FullMatrix::forward<>(Vector&, const Vector&) const; +template void FullMatrix::backward<>(Vector&, const Vector&) const; +template void FullMatrix::householder<>(Vector&); +template double FullMatrix::least_squares<>(Vector&, Vector&); template -void FullMatrix::precondition_Jacobi (Vector &, - const Vector &, - const TYPEMAT) const; +void FullMatrix::precondition_Jacobi<> (Vector &, + const Vector &, + const TYPEMAT) const; #undef TYPEVEC #define TYPEVEC float -template void FullMatrix::fill_permutation (const FullMatrix&, - const std::vector&, - const std::vector&); -template void FullMatrix::vmult(Vector&, const Vector&, const bool) const; -template void FullMatrix::Tvmult(Vector&, const Vector&, const bool) const; -template double FullMatrix::residual(Vector&, const Vector&, const Vector&) const; -template TYPEVEC FullMatrix::matrix_norm_square (const Vector &) const; -template TYPEVEC FullMatrix::matrix_scalar_product(const Vector&, const Vector&) const; -template void FullMatrix::forward(Vector&, const Vector&) const; -template void FullMatrix::backward(Vector&, const Vector&) const; -template void FullMatrix::householder(Vector&); -template double FullMatrix::least_squares(Vector&, Vector&); +template void FullMatrix::fill_permutation<> (const FullMatrix&, + const std::vector&, + const std::vector&); +template void FullMatrix::vmult<>(Vector&, const Vector&, const bool) const; +template void FullMatrix::Tvmult<>(Vector&, const Vector&, const bool) const; +template double FullMatrix::residual<>(Vector&, const Vector&, const Vector&) const; +template TYPEVEC FullMatrix::matrix_norm_square<> (const Vector &) const; +template TYPEVEC FullMatrix::matrix_scalar_product<>(const Vector&, const Vector&) const; +template void FullMatrix::forward<>(Vector&, const Vector&) const; +template void FullMatrix::backward<>(Vector&, const Vector&) const; +template void FullMatrix::householder<>(Vector&); +template double FullMatrix::least_squares<>(Vector&, Vector&); template -void FullMatrix::precondition_Jacobi (Vector &, - const Vector &, - const TYPEMAT) const; +void FullMatrix::precondition_Jacobi<> (Vector &, + const Vector &, + const TYPEMAT) const; #undef TYPERES #define TYPERES float -template double FullMatrix::residual(Vector&, const Vector&, const Vector&) const; +template double FullMatrix::residual<>(Vector&, const Vector&, const Vector&) const; diff --git a/deal.II/lac/source/precondition_block.cc b/deal.II/lac/source/precondition_block.cc index 8c2d45f619..626a75b22d 100644 --- a/deal.II/lac/source/precondition_block.cc +++ b/deal.II/lac/source/precondition_block.cc @@ -35,59 +35,59 @@ template class PreconditionBlock; // explicit instantiations for "float" PreconditionBlock template class PreconditionBlockJacobi; -template void PreconditionBlockJacobi::vmult +template void PreconditionBlockJacobi::vmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::vmult +template void PreconditionBlockJacobi::vmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult +template void PreconditionBlockJacobi::Tvmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult +template void PreconditionBlockJacobi::Tvmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::vmult_add +template void PreconditionBlockJacobi::vmult_add<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::vmult_add +template void PreconditionBlockJacobi::vmult_add<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult_add +template void PreconditionBlockJacobi::Tvmult_add<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult_add +template void PreconditionBlockJacobi::Tvmult_add<> (Vector &, const Vector &) const; template class PreconditionBlockJacobi; -template void PreconditionBlockJacobi::vmult +template void PreconditionBlockJacobi::vmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::vmult +template void PreconditionBlockJacobi::vmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult +template void PreconditionBlockJacobi::Tvmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult +template void PreconditionBlockJacobi::Tvmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::vmult_add +template void PreconditionBlockJacobi::vmult_add<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::vmult_add +template void PreconditionBlockJacobi::vmult_add<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult_add +template void PreconditionBlockJacobi::Tvmult_add<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult_add +template void PreconditionBlockJacobi::Tvmult_add<> (Vector &, const Vector &) const; template class PreconditionBlockJacobi; -template void PreconditionBlockJacobi::vmult +template void PreconditionBlockJacobi::vmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::vmult +template void PreconditionBlockJacobi::vmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult +template void PreconditionBlockJacobi::Tvmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult +template void PreconditionBlockJacobi::Tvmult<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::vmult_add +template void PreconditionBlockJacobi::vmult_add<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::vmult_add +template void PreconditionBlockJacobi::vmult_add<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult_add +template void PreconditionBlockJacobi::Tvmult_add<> (Vector &, const Vector &) const; -template void PreconditionBlockJacobi::Tvmult_add +template void PreconditionBlockJacobi::Tvmult_add<> (Vector &, const Vector &) const; /*--------------------- PreconditionBlockGaussSeidel -----------------------*/ @@ -96,13 +96,13 @@ template void PreconditionBlockJacobi::Tvmult_add // explicit instantiations for "float" PreconditionBlock template class PreconditionBlockSOR; -template void PreconditionBlockSOR::vmult ( +template void PreconditionBlockSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSOR::vmult ( +template void PreconditionBlockSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSOR::Tvmult ( +template void PreconditionBlockSOR::Tvmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSOR::Tvmult ( +template void PreconditionBlockSOR::Tvmult<> ( Vector &, const Vector &) const; @@ -115,24 +115,24 @@ template void PreconditionBlockSOR::Tvmult ( template class PreconditionBlockSOR; -template void PreconditionBlockSOR::vmult ( +template void PreconditionBlockSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSOR::vmult ( +template void PreconditionBlockSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSOR::Tvmult ( +template void PreconditionBlockSOR::Tvmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSOR::Tvmult ( +template void PreconditionBlockSOR::Tvmult<> ( Vector &, const Vector &) const; template class PreconditionBlockSOR; -template void PreconditionBlockSOR::vmult ( +template void PreconditionBlockSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSOR::vmult ( +template void PreconditionBlockSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSOR::Tvmult ( +template void PreconditionBlockSOR::Tvmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSOR::Tvmult ( +template void PreconditionBlockSOR::Tvmult<> ( Vector &, const Vector &) const; @@ -142,13 +142,13 @@ template void PreconditionBlockSOR::Tvmult ( // explicit instantiations for "float" PreconditionBlock template class PreconditionBlockSSOR; -template void PreconditionBlockSSOR::vmult ( +template void PreconditionBlockSSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSSOR::vmult ( +template void PreconditionBlockSSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSSOR::Tvmult ( +template void PreconditionBlockSSOR::Tvmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSSOR::Tvmult ( +template void PreconditionBlockSSOR::Tvmult<> ( Vector &, const Vector &) const; @@ -161,22 +161,22 @@ template void PreconditionBlockSSOR::Tvmult ( template class PreconditionBlockSSOR; -template void PreconditionBlockSSOR::vmult ( +template void PreconditionBlockSSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSSOR::vmult ( +template void PreconditionBlockSSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSSOR::Tvmult ( +template void PreconditionBlockSSOR::Tvmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSSOR::Tvmult ( +template void PreconditionBlockSSOR::Tvmult<> ( Vector &, const Vector &) const; template class PreconditionBlockSSOR; -template void PreconditionBlockSSOR::vmult ( +template void PreconditionBlockSSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSSOR::vmult ( +template void PreconditionBlockSSOR::vmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSSOR::Tvmult ( +template void PreconditionBlockSSOR::Tvmult<> ( Vector &, const Vector &) const; -template void PreconditionBlockSSOR::Tvmult ( +template void PreconditionBlockSSOR::Tvmult<> ( Vector &, const Vector &) const; diff --git a/deal.II/lac/source/sparse_ilu.cc b/deal.II/lac/source/sparse_ilu.cc index 896dd3dfae..130b599476 100644 --- a/deal.II/lac/source/sparse_ilu.cc +++ b/deal.II/lac/source/sparse_ilu.cc @@ -17,22 +17,22 @@ // explicit instantiations template class SparseILU; -template void SparseILU::decompose (const SparseMatrix &, - const double); -template void SparseILU::apply_decomposition (Vector &, - const Vector &) const; -template void SparseILU::decompose (const SparseMatrix &, - const double); -template void SparseILU::apply_decomposition (Vector &, - const Vector &) const; +template void SparseILU::decompose<> (const SparseMatrix &, + const double); +template void SparseILU::apply_decomposition<> (Vector &, + const Vector &) const; +template void SparseILU::decompose<> (const SparseMatrix &, + const double); +template void SparseILU::apply_decomposition<> (Vector &, + const Vector &) const; template class SparseILU; -template void SparseILU::decompose (const SparseMatrix &, - const double); -template void SparseILU::apply_decomposition (Vector &, - const Vector &) const; -template void SparseILU::decompose (const SparseMatrix &, - const double); -template void SparseILU::apply_decomposition (Vector &, - const Vector &) const; +template void SparseILU::decompose<> (const SparseMatrix &, + const double); +template void SparseILU::apply_decomposition<> (Vector &, + const Vector &) const; +template void SparseILU::decompose<> (const SparseMatrix &, + const double); +template void SparseILU::apply_decomposition<> (Vector &, + const Vector &) const; diff --git a/deal.II/lac/source/sparse_vanka.cc b/deal.II/lac/source/sparse_vanka.cc index c033ec1408..f844a3d36f 100644 --- a/deal.II/lac/source/sparse_vanka.cc +++ b/deal.II/lac/source/sparse_vanka.cc @@ -19,16 +19,16 @@ template class SparseVanka; template class SparseVanka; -template void SparseVanka::vmult (Vector &dst, - const Vector &src) const; -template void SparseVanka::vmult (Vector &dst, - const Vector &src) const; +template void SparseVanka::vmult<> (Vector &dst, + const Vector &src) const; +template void SparseVanka::vmult<> (Vector &dst, + const Vector &src) const; template class SparseBlockVanka; template class SparseBlockVanka; -template void SparseBlockVanka::vmult (Vector &dst, - const Vector &src) const; -template void SparseBlockVanka::vmult (Vector &dst, - const Vector &src) const; +template void SparseBlockVanka::vmult<> (Vector &dst, + const Vector &src) const; +template void SparseBlockVanka::vmult<> (Vector &dst, + const Vector &src) const; diff --git a/deal.II/lac/source/sparsity_pattern.cc b/deal.II/lac/source/sparsity_pattern.cc index 5edda62920..eca7bc5e7d 100644 --- a/deal.II/lac/source/sparsity_pattern.cc +++ b/deal.II/lac/source/sparsity_pattern.cc @@ -786,5 +786,5 @@ SparsityPattern::memory_consumption () const // explicit instantiations -template void SparsityPattern::copy_from (const FullMatrix &); -template void SparsityPattern::copy_from (const FullMatrix &); +template void SparsityPattern::copy_from<> (const FullMatrix &); +template void SparsityPattern::copy_from<> (const FullMatrix &); diff --git a/deal.II/lac/source/vector.cc b/deal.II/lac/source/vector.cc index 8fad192863..a119df8f17 100644 --- a/deal.II/lac/source/vector.cc +++ b/deal.II/lac/source/vector.cc @@ -16,22 +16,22 @@ // explicit instantiations template class Vector; -template Vector& Vector::operator=(const Vector&); -template double Vector::operator*(const Vector&) const; -template double Vector::operator*(const Vector&) const; -template void Vector::reinit(const Vector&, const bool); -template void Vector::reinit(const Vector&, const bool); -template void Vector::equ(const double, const Vector&); -template void Vector::equ(const double, const Vector&); +template Vector& Vector::template operator=<>(const Vector&); +template double Vector::template operator*<>(const Vector&) const; +template double Vector::template operator*<>(const Vector&) const; +template void Vector::reinit<>(const Vector&, const bool); +template void Vector::reinit<>(const Vector&, const bool); +template void Vector::equ<>(const double, const Vector&); +template void Vector::equ<>(const double, const Vector&); template class Vector; -template Vector& Vector::operator=(const Vector&); -template float Vector::operator*(const Vector&) const; -template float Vector::operator*(const Vector&) const; -template void Vector::reinit(const Vector&, const bool); -template void Vector::reinit(const Vector&, const bool); -template void Vector::equ(const float, const Vector&); -template void Vector::equ(const float, const Vector&); +template Vector& Vector::template operator=<>(const Vector&); +template float Vector::template operator*<>(const Vector&) const; +template float Vector::template operator*<>(const Vector&) const; +template void Vector::reinit<>(const Vector&, const bool); +template void Vector::reinit<>(const Vector&, const bool); +template void Vector::equ<>(const float, const Vector&); +template void Vector::equ<>(const float, const Vector&); // see the .h file for why these functions are disabled. // template Vector::Vector (const Vector& v); diff --git a/deal.II/lac/source/vector.long_double.cc b/deal.II/lac/source/vector.long_double.cc index 3567be1883..be7edf17b4 100644 --- a/deal.II/lac/source/vector.long_double.cc +++ b/deal.II/lac/source/vector.long_double.cc @@ -17,27 +17,27 @@ // explicit instantiations template class Vector; -template Vector& Vector::operator=(const Vector&); -template Vector& Vector::operator=(const Vector&); -template long double Vector::operator * (const Vector &) const; -template long double Vector::operator * (const Vector &) const; -template long double Vector::operator * (const Vector &) const; -template void Vector::reinit(const Vector&, const bool); -template void Vector::reinit(const Vector&, const bool); -template void Vector::reinit(const Vector&, const bool); -template void Vector::equ(const long double, const Vector&); -template void Vector::equ(const long double, const Vector&); -template void Vector::equ(const long double, const Vector&); +template Vector& Vector::template operator=<>(const Vector&); +template Vector& Vector::template operator=<>(const Vector&); +template long double Vector::template operator *<> (const Vector &) const; +template long double Vector::template operator *<> (const Vector &) const; +template long double Vector::template operator *<> (const Vector &) const; +template void Vector::reinit<>(const Vector&, const bool); +template void Vector::reinit<>(const Vector&, const bool); +template void Vector::reinit<>(const Vector&, const bool); +template void Vector::equ<>(const long double, const Vector&); +template void Vector::equ<>(const long double, const Vector&); +template void Vector::equ<>(const long double, const Vector&); -template Vector& Vector::operator=(const Vector&); -template double Vector::operator * (const Vector &) const; -template void Vector::reinit(const Vector&, const bool); -template void Vector::equ(const double, const Vector&); +template Vector& Vector::template operator=<>(const Vector&); +template double Vector::template operator *<> (const Vector &) const; +template void Vector::reinit<>(const Vector&, const bool); +template void Vector::equ<>(const double, const Vector&); -template Vector& Vector::operator=(const Vector&); -template float Vector::operator * (const Vector &) const; -template void Vector::reinit(const Vector&, const bool); -template void Vector::equ(const float, const Vector&); +template Vector& Vector::template operator=<>(const Vector&); +template float Vector::template operator *<> (const Vector &) const; +template void Vector::reinit<>(const Vector&, const bool); +template void Vector::equ<>(const float, const Vector&); // see the .h file for why these functions are disabled. // template Vector::Vector (const Vector& v); -- 2.39.5