From 1b702ffc0531a2d54bee277bb79e4af7b8412fb1 Mon Sep 17 00:00:00 2001 From: wolf Date: Fri, 19 Apr 2002 13:51:14 +0000 Subject: [PATCH] Intels ICC compiler wants that in explicit instantiations of member templates the actual template args are given. The standard prescribes that they can be omitted if the compiler can infer them from the function args, but Intel does not seem to implement that rule. Since we want the compiler to be cross-compiler portable, state these args then nevertheless. git-svn-id: https://svn.dealii.org/trunk@5693 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/dof_levels.h | 68 ++- deal.II/deal.II/source/dofs/dof_accessor.cc | 160 +++-- .../deal.II/source/dofs/dof_constraints.cc | 10 +- .../deal.II/source/dofs/dof_renumbering.cc | 62 +- deal.II/deal.II/source/dofs/dof_tools.cc | 370 +++++++----- deal.II/deal.II/source/fe/fe_tools.cc | 124 ++-- deal.II/deal.II/source/fe/fe_values.cc | 120 ++-- .../deal.II/source/fe/mapping_cartesian.cc | 12 +- deal.II/deal.II/source/fe/mapping_q1.cc | 12 +- deal.II/deal.II/source/grid/grid_generator.cc | 19 +- deal.II/deal.II/source/grid/grid_out.cc | 28 +- .../deal.II/source/grid/grid_refinement.cc | 56 +- .../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 | 62 +- .../deal.II/source/multigrid/mg_smoother.cc | 8 +- deal.II/deal.II/source/multigrid/multigrid.cc | 13 +- deal.II/deal.II/source/numerics/data_out.cc | 36 +- .../deal.II/source/numerics/data_out_stack.cc | 10 +- .../numerics/derivative_approximation.cc | 40 +- deal.II/deal.II/source/numerics/histogram.cc | 28 +- .../numerics/matrices.all_dimensions.cc | 20 +- deal.II/deal.II/source/numerics/matrices.cc | 128 ++-- deal.II/deal.II/source/numerics/vectors.cc | 546 ++++++++++-------- deal.II/lac/include/lac/block_vector.h | 2 +- .../lac/include/lac/sparse_matrix.2.templates | 74 +-- deal.II/lac/source/block_vector.cc | 28 +- deal.II/lac/source/full_matrix.double.cc | 93 +-- deal.II/lac/source/full_matrix.float.cc | 60 +- 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 +- 35 files changed, 1369 insertions(+), 1038 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_levels.h b/deal.II/deal.II/include/dofs/dof_levels.h index 21e96b8f0f..6189ef3daf 100644 --- a/deal.II/deal.II/include/dofs/dof_levels.h +++ b/deal.II/deal.II/include/dofs/dof_levels.h @@ -31,15 +31,17 @@ class DoFLevel { private: /** - * Make the constructor private to avoid - * that someone uses this class. + * Make the constructor private + * to avoid that someone uses + * this class. */ DoFLevel (); }; /** - * Store the indices of the degrees of freedom which are located on the lines. + * Store the indices of the degrees of freedom which are located on + * the lines. * * @sect3{Information for all @ref{DoFLevel} classes} * @@ -65,21 +67,24 @@ class DoFLevel * is then * to be understood as a block matrix. * - * The storage format of the degrees of freedom indices (short: DoF indices) is - * somewhat like a mirror of the data structures of the triangulation classes. - * There is a hierarchy of @ref{DoFLevel}@p{} classes for the different dimensions - * which have objects named @p{line_dofs}, @p{quad_dofs} and so on, in which the - * indices of DoFs located on lines and quads, respectively, are stored. The - * indices are stored levelwise. The layout in - * these arrays is as follows: if for a selected finite element (use - * @ref{DoFHandler}@p{::distribute_dofs()} to select a finite element) the number of - * DoFs on each line (without those in the vertices) is @p{N}, then the length - * of the @p{line_dofs} array is @p{N} times the number of lines on this level. The - * DoF indices for the @p{i}th line are at the positions @p{N*i...(N+1)*i-1}. + * The storage format of the degrees of freedom indices (short: DoF + * indices) is somewhat like a mirror of the data structures of the + * triangulation classes. There is a hierarchy of + * @ref{DoFLevel}@p{} classes for the different dimensions which + * have objects named @p{line_dofs}, @p{quad_dofs} and so on, in which + * the indices of DoFs located on lines and quads, respectively, are + * stored. The indices are stored levelwise. The layout in these + * arrays is as follows: if for a selected finite element (use + * @ref{DoFHandler}@p{::distribute_dofs()} to select a finite element) + * the number of DoFs on each line (without those in the vertices) is + * @p{N}, then the length of the @p{line_dofs} array is @p{N} times + * the number of lines on this level. The DoF indices for the @p{i}th + * line are at the positions @p{N*i...(N+1)*i-1}. * - * The DoF indices for vertices are not stored this way, since they need - * different treatment in multigrid environments. If no multigrid is used, the - * indices are stored in the @p{vertex_dofs} array of the @ref{DoFHandler} class. + * The DoF indices for vertices are not stored this way, since they + * need different treatment in multigrid environments. If no multigrid + * is used, the indices are stored in the @p{vertex_dofs} array of the + * @ref{DoFHandler} class. * * @author Wolfgang Bangerth, 1998 */ @@ -88,9 +93,10 @@ class DoFLevel<1> { public: /** - * Store the global indices of the degrees - * of freedom. See @ref{DoFLevel} for - * detailed information. + * Store the global indices of + * the degrees of freedom. See + * @ref{DoFLevel} for detailed + * information. */ std::vector line_dofs; @@ -105,8 +111,8 @@ class DoFLevel<1> /** - * Store the indices of the degrees of freedom which are located on quads. - * See @ref{DoFLevel<1>} for more information. + * Store the indices of the degrees of freedom which are located on + * quads. See @ref{DoFLevel<1>} for more information. * * @author Wolfgang Bangerth, 1998 */ @@ -115,9 +121,10 @@ class DoFLevel<2> : public DoFLevel<1> { public: /** - * Store the global indices of the degrees - * of freedom. See @ref{DoFLevel} for - * detailed information. + * Store the global indices of + * the degrees of freedom. See + * @ref{DoFLevel} for detailed + * information. */ std::vector quad_dofs; @@ -132,8 +139,8 @@ class DoFLevel<2> : public DoFLevel<1> /** - * Store the indices of the degrees of freedom which are located on hexhedra. - * See @ref{DoFLevel<1>} for more information. + * Store the indices of the degrees of freedom which are located on + * hexhedra. See @ref{DoFLevel<1>} for more information. * * @author Wolfgang Bangerth, 1998 */ @@ -142,9 +149,10 @@ class DoFLevel<3> : public DoFLevel<2> { public: /** - * Store the global indices of the degrees - * of freedom. See @ref{DoFLevel} for - * detailed information. + * Store the global indices of + * the degrees of freedom. See + * @ref{DoFLevel} for detailed + * information. */ std::vector hex_dofs; diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index 22aade4633..3aea88fcf6 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -742,92 +742,108 @@ 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,double> +(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,double> +(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,float> +(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,float> +(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,double> +(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,double> +(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,float> +(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,float> +(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,double> +(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,double> +(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,float> +(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,float> +(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,double> +(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,double> +(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,float> +(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,float> +(const Vector &, + BlockVector &) const; #endif @@ -837,44 +853,52 @@ 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,double> +(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,double> +(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,float> +(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,float> +(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,double> +(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,double> +(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,float> +(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,float> +(const Vector &, + BlockVector &) const; #endif @@ -884,52 +908,60 @@ 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,double> +(const Vector &, + Vector &) const; template void DoFCellAccessor:: -set_dof_values_by_interpolation<>(const Vector &, - Vector &) const; +set_dof_values_by_interpolation,double> +(const Vector &, + Vector &) const; template void DoFCellAccessor:: -get_interpolated_dof_values<> (const Vector &, - Vector &) const; +get_interpolated_dof_values,float> +(const Vector &, + Vector &) const; template void DoFCellAccessor:: -set_dof_values_by_interpolation<>(const Vector &, - Vector &) const; +set_dof_values_by_interpolation,float> +(const Vector &, + Vector &) const; template void DoFCellAccessor:: -get_interpolated_dof_values<> (const BlockVector &, - Vector &) const; +get_interpolated_dof_values,double> +(const BlockVector &, + Vector &) const; template void DoFCellAccessor:: -set_dof_values_by_interpolation<>(const Vector &, - BlockVector &) const; +set_dof_values_by_interpolation,double> +(const Vector &, + BlockVector &) const; template void DoFCellAccessor:: -get_interpolated_dof_values<> (const BlockVector &, - Vector &) const; +get_interpolated_dof_values,float> +(const BlockVector &, + Vector &) const; template void DoFCellAccessor:: -set_dof_values_by_interpolation<>(const Vector &, - BlockVector &) const; +set_dof_values_by_interpolation,float> +(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 f5cc6b33fe..e7b6b898ef 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/deal.II/source/dofs/dof_constraints.cc @@ -1203,12 +1203,12 @@ ConstraintMatrix::memory_consumption () const #define vector_functions \ template void ConstraintMatrix::condense(const VectorType &uncondensed,\ - VectorType &condensed) const;\ + 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::set_zero(VectorType &vec) const;\ + template void ConstraintMatrix::distribute(const VectorType &condensed,\ + VectorType &uncondensed) const;\ + template void ConstraintMatrix::distribute(VectorType &vec) const; diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc index f14d7b6aa3..a1964b0b23 100644 --- a/deal.II/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc @@ -863,50 +863,60 @@ 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 73684c83b3..85c9d652a8 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -293,7 +293,7 @@ void DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, -template +template void DoFTools::make_flux_sparsity_pattern (const DoFHandler &dof, SparsityPattern &sparsity) @@ -436,12 +436,12 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler<1> &dof, #endif -template +template void DoFTools::make_flux_sparsity_pattern (const DoFHandler &dof, SparsityPattern &sparsity, - const FullMatrix& int_mask, - const FullMatrix& flux_mask) + const FullMatrix &int_mask, + const FullMatrix &flux_mask) { const unsigned int n_dofs = dof.n_dofs(); const FiniteElement& fe = dof.get_fe(); @@ -1157,7 +1157,7 @@ DoFTools::extract_hanging_node_dofs (const DoFHandler<1> &dof_handler, Assert(selected_dofs.size() == dof_handler.n_dofs(), ExcDimensionMismatch(selected_dofs.size(), dof_handler.n_dofs())); // preset all values by false - fill_n (selected_dofs.begin(), dof_handler.n_dofs(), false); + std::fill_n (selected_dofs.begin(), dof_handler.n_dofs(), false); // there are no hanging nodes in 1d }; @@ -2342,183 +2342,284 @@ 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_sparsity_pattern +(const DoFHandler &dof, + SparsityPattern &sparsity); + +template void +DoFTools::make_sparsity_pattern +(const DoFHandler &dof, + CompressedSparsityPattern &sparsity); + +template void +DoFTools::make_sparsity_pattern +(const DoFHandler &dof, + BlockSparsityPattern &sparsity); +template void +DoFTools::make_sparsity_pattern +(const DoFHandler &dof, + CompressedBlockSparsityPattern &sparsity); + + +template void +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); + +template void +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); + #if deal_II_dimension > 1 template void -DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, - SparsityPattern &, - const FullMatrix&, - const FullMatrix&); +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 &); template void -DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, - CompressedSparsityPattern &sparsity); +DoFTools::make_boundary_sparsity_pattern +(const DoFHandler& dof, + const std::vector &, + BlockSparsityPattern &); template void -DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, - CompressedSparsityPattern &, - const FullMatrix&, - const FullMatrix&); +DoFTools::make_boundary_sparsity_pattern +(const DoFHandler& dof, + const std::vector &, + CompressedBlockSparsityPattern &); + template void -DoFTools::make_flux_sparsity_pattern<> (const DoFHandler& dof, - BlockSparsityPattern &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_flux_sparsity_pattern<> (const DoFHandler& dof, - BlockSparsityPattern &, - const FullMatrix&, - const FullMatrix&); +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_flux_sparsity_pattern<> (const DoFHandler& dof, - CompressedBlockSparsityPattern &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_flux_sparsity_pattern<> (const DoFHandler& dof, - CompressedBlockSparsityPattern &, - const FullMatrix&, - const FullMatrix&); +DoFTools::make_boundary_sparsity_pattern +(const DoFHandler& dof, + const FunctionMap::type &boundary_indicators, + const std::vector &dof_to_boundary_mapping, + CompressedBlockSparsityPattern &sparsity); #endif +#if deal_II_dimension == 1 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); +#endif +#if deal_II_dimension > 1 template void -DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, - SparsityPattern &sparsity); - +DoFTools::make_flux_sparsity_pattern +(const DoFHandler& dof, + SparsityPattern &sparsity); template void -DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, - CompressedSparsityPattern &sparsity); - +DoFTools::make_flux_sparsity_pattern +(const DoFHandler& dof, + CompressedSparsityPattern &sparsity); template void -DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, - BlockSparsityPattern &sparsity); +DoFTools::make_flux_sparsity_pattern +(const DoFHandler& dof, + BlockSparsityPattern &sparsity); template void -DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, - CompressedBlockSparsityPattern &sparsity); - - -template void -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); - -template void -DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, - const std::vector > &mask, - BlockSparsityPattern &sparsity); +DoFTools::make_flux_sparsity_pattern +(const DoFHandler& dof, + CompressedBlockSparsityPattern &sparsity); +#else +template void +DoFTools::make_flux_sparsity_pattern +(const DoFHandler<1>& dof, + SparsityPattern &sparsity); +template void +DoFTools::make_flux_sparsity_pattern +(const DoFHandler<1>& dof, + CompressedSparsityPattern &sparsity); +template void +DoFTools::make_flux_sparsity_pattern +(const DoFHandler<1>& dof, + BlockSparsityPattern &sparsity); +template void +DoFTools::make_flux_sparsity_pattern +(const DoFHandler<1>& dof, + CompressedBlockSparsityPattern &sparsity); +#endif -template void -DoFTools::make_sparsity_pattern<> (const DoFHandler &dof, - const std::vector > &mask, - CompressedBlockSparsityPattern &sparsity); +#if deal_II_dimension > 1 +template void +DoFTools::make_flux_sparsity_pattern +(const DoFHandler& dof, + SparsityPattern &, + const FullMatrix&, + const FullMatrix&); +template void +DoFTools::make_flux_sparsity_pattern +(const DoFHandler& dof, + CompressedSparsityPattern &, + const FullMatrix&, + const FullMatrix&); +template void +DoFTools::make_flux_sparsity_pattern +(const DoFHandler& dof, + BlockSparsityPattern &, + const FullMatrix&, + const FullMatrix&); +template void +DoFTools::make_flux_sparsity_pattern +(const DoFHandler& dof, + CompressedBlockSparsityPattern &, + const FullMatrix&, + const FullMatrix&); +#endif 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 +2627,16 @@ DoFTools::compute_intergrid_transfer_representation<> (const DoFHandler (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 +2644,7 @@ 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 8074e15806..e02a3db509 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -711,79 +711,95 @@ 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 47709dccee..a4c2edab9c 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -835,88 +835,112 @@ 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 fa7813c8da..6c08421476 100644 --- a/deal.II/deal.II/source/fe/mapping_cartesian.cc +++ b/deal.II/deal.II/source/fe/mapping_cartesian.cc @@ -625,25 +625,29 @@ 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 01d908122f..4fa0fbf3ec 100644 --- a/deal.II/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/deal.II/source/fe/mapping_q1.cc @@ -1037,25 +1037,29 @@ 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 1ac36b52ad..8b6334ecd7 100644 --- a/deal.II/deal.II/source/grid/grid_generator.cc +++ b/deal.II/deal.II/source/grid/grid_generator.cc @@ -958,18 +958,19 @@ 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 69290cc098..d353603b12 100644 --- a/deal.II/deal.II/source/grid/grid_out.cc +++ b/deal.II/deal.II/source/grid/grid_out.cc @@ -839,17 +839,21 @@ 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 14c369f3b8..9956ea00d2 100644 --- a/deal.II/deal.II/source/grid/grid_refinement.cc +++ b/deal.II/deal.II/source/grid/grid_refinement.cc @@ -319,46 +319,54 @@ 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); +::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); +::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, - const double top_fraction, - const double bottom_fraction); +::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); +::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); +::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 b109843468..cae5e07256 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 d50e6cd6fc..d8ee977a56 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 f1886de104..1781bb1176 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_tools.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_tools.cc @@ -403,88 +403,88 @@ MGTools::reinit_vector (const MGDoFHandler& mg_dof, // explicit instantiations template void -MGTools::make_sparsity_pattern<> (const MGDoFHandler &, +MGTools::make_sparsity_pattern (const MGDoFHandler &, SparsityPattern &, const unsigned int); template void -MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, +MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, SparsityPattern &, const unsigned int); template void -MGTools::make_flux_sparsity_pattern_edge<> (const MGDoFHandler &, +MGTools::make_flux_sparsity_pattern_edge (const MGDoFHandler &, SparsityPattern &, const unsigned int); template void -MGTools::make_sparsity_pattern<> (const MGDoFHandler &, +MGTools::make_sparsity_pattern (const MGDoFHandler &, CompressedSparsityPattern &, const unsigned int); template void -MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, +MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, CompressedSparsityPattern &, const unsigned int); template void -MGTools::make_flux_sparsity_pattern_edge<> (const MGDoFHandler &, +MGTools::make_flux_sparsity_pattern_edge (const MGDoFHandler &, CompressedSparsityPattern &, const unsigned int); template void -MGTools::make_sparsity_pattern<> (const MGDoFHandler &, +MGTools::make_sparsity_pattern (const MGDoFHandler &, BlockSparsityPattern &, const unsigned int); template void -MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, +MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, BlockSparsityPattern &, const unsigned int); template void -MGTools::make_flux_sparsity_pattern_edge<> (const MGDoFHandler &, +MGTools::make_flux_sparsity_pattern_edge (const MGDoFHandler &, BlockSparsityPattern &, const unsigned int); template void -MGTools::make_sparsity_pattern<> (const MGDoFHandler &, +MGTools::make_sparsity_pattern (const MGDoFHandler &, CompressedBlockSparsityPattern &, const unsigned int); template void -MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, +MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, CompressedBlockSparsityPattern &, const unsigned int); template void -MGTools::make_flux_sparsity_pattern_edge<> (const MGDoFHandler &, +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 &, +MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, SparsityPattern &, const unsigned int, const FullMatrix&, const FullMatrix&); template void -MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, +MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, CompressedSparsityPattern &, const unsigned int, const FullMatrix&, const FullMatrix&); template void -MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, +MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, BlockSparsityPattern &, const unsigned int, const FullMatrix&, const FullMatrix&); template void -MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, +MGTools::make_flux_sparsity_pattern (const MGDoFHandler &, CompressedBlockSparsityPattern &, const unsigned int, const FullMatrix&, @@ -492,63 +492,63 @@ MGTools::make_flux_sparsity_pattern<> (const MGDoFHandler &, #endif -template void MGTools::reinit_vector<> (const MGDoFHandler&, +template void MGTools::reinit_vector (const MGDoFHandler&, MGLevelObject >&); -template void MGTools::reinit_vector<> (const MGDoFHandler&, +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&, +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 d0b822535d..827b0b1672 100644 --- a/deal.II/deal.II/source/multigrid/mg_smoother.cc +++ b/deal.II/deal.II/source/multigrid/mg_smoother.cc @@ -138,19 +138,19 @@ template MGSmootherContinuous::MGSmootherContinuous (const MGDoFHandler (const unsigned int, +void MGSmootherContinuous::set_zero_interior_boundary > (const unsigned int, Vector&) const; template -void MGSmootherContinuous::set_zero_interior_boundary<> (const unsigned int, +void MGSmootherContinuous::set_zero_interior_boundary > (const unsigned int, Vector&) const; template -void MGSmootherContinuous::set_zero_interior_boundary<> (const unsigned int, +void MGSmootherContinuous::set_zero_interior_boundary > (const unsigned int, BlockVector&) const; template -void MGSmootherContinuous::set_zero_interior_boundary<> (const unsigned int, +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 f7781ad870..0314ee90b9 100644 --- a/deal.II/deal.II/source/multigrid/multigrid.cc +++ b/deal.II/deal.II/source/multigrid/multigrid.cc @@ -333,12 +333,15 @@ 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 790e31e676..0838dd1cd3 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -643,44 +643,52 @@ 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 +701,26 @@ 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 9803737990..ba1b5f0a0b 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,9 @@ 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 3467d67424..72b8c8dbef 100644 --- a/deal.II/deal.II/source/numerics/derivative_approximation.cc +++ b/deal.II/deal.II/source/numerics/derivative_approximation.cc @@ -713,31 +713,35 @@ 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 cc75cd980e..1003659a59 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 307da1e91c..df2171766f 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 5a72b0dfd8..0d56e2c900 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -1228,77 +1228,87 @@ 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/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index b0228abe06..0d7a2ae07d 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -1460,298 +1460,340 @@ 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 +1801,22 @@ 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/lac/include/lac/block_vector.h b/deal.II/lac/include/lac/block_vector.h index fe42c8c2fd..448fb4963e 100644 --- a/deal.II/lac/include/lac/block_vector.h +++ b/deal.II/lac/include/lac/block_vector.h @@ -854,7 +854,7 @@ class BlockVector */ template BlockVector & - operator= (const BlockVector< Number2>& V); + operator= (const BlockVector& V); /** * $U = U * V$: scalar product. diff --git a/deal.II/lac/include/lac/sparse_matrix.2.templates b/deal.II/lac/include/lac/sparse_matrix.2.templates index e1b053c4fc..a68e1bea80 100644 --- a/deal.II/lac/include/lac/sparse_matrix.2.templates +++ b/deal.II/lac/include/lac/sparse_matrix.2.templates @@ -18,55 +18,63 @@ // TYPEMAT and TYPE2 are defined in sparsematrix?.cc template SparseMatrix & -SparseMatrix::copy_from<> (const SparseMatrix &); +SparseMatrix::copy_from (const SparseMatrix &); template -void SparseMatrix::copy_from<> (const FullMatrix &); - -template void SparseMatrix::add_scaled<> (const TYPEMAT, - const SparseMatrix &); - -template void SparseMatrix::vmult<> (Vector &, - const Vector &) const; -template void SparseMatrix::Tvmult<> (Vector &, - const Vector &) const; -template void SparseMatrix::vmult_add<> (Vector &, - const Vector &) const; -template void SparseMatrix::Tvmult_add<> (Vector &, +void SparseMatrix::copy_from (const FullMatrix &); + +template void SparseMatrix::add_scaled (const TYPEMAT, + const SparseMatrix &); + +template void SparseMatrix::vmult (Vector &, const Vector &) const; +template void SparseMatrix::Tvmult (Vector &, + const Vector &) const; +template void SparseMatrix::vmult_add (Vector &, + const Vector &) const; +template void SparseMatrix::Tvmult_add (Vector &, + const Vector &) const; template TYPE2 -SparseMatrix::matrix_norm_square<> (const Vector &) const; +SparseMatrix::matrix_norm_square (const Vector &) const; template TYPE2 -SparseMatrix::matrix_scalar_product<> (const Vector &, - const Vector &) const; +SparseMatrix::matrix_scalar_product (const Vector &, + const Vector &) const; -template TYPE2 SparseMatrix::residual<> (Vector &, - const Vector &, - const Vector &) const; +template TYPE2 SparseMatrix::residual (Vector &, + const Vector &, + const Vector &) const; -template void SparseMatrix::precondition_SSOR<> (Vector &, - const Vector &, - const TYPEMAT) const; +template void SparseMatrix::precondition_SSOR (Vector &, + const Vector &, + const TYPEMAT) const; -template void SparseMatrix::precondition_SOR<> (Vector &, - const Vector &, - const TYPEMAT) const; +template void SparseMatrix::precondition_SOR (Vector &, + const Vector &, + const TYPEMAT) const; -template void SparseMatrix::precondition_TSOR<> (Vector &, +template void SparseMatrix::precondition_TSOR (Vector &, const Vector &, const TYPEMAT) const; -template void SparseMatrix::precondition_Jacobi<> (Vector &, +template void SparseMatrix::precondition_Jacobi (Vector &, const Vector &, const TYPEMAT) const; -template void SparseMatrix::SOR<> (Vector &, const TYPEMAT) const; -template void SparseMatrix::TSOR<> (Vector &, const TYPEMAT) const; -template void SparseMatrix::SSOR<> (Vector &, const TYPEMAT) const; -template void SparseMatrix::SOR_step<> (Vector &, const Vector &, const TYPEMAT) const; -template void SparseMatrix::TSOR_step<> (Vector &, const Vector &, const TYPEMAT) const; -template void SparseMatrix::SSOR_step<> (Vector &, const Vector &, const TYPEMAT) const; +template void SparseMatrix::SOR (Vector &, + const TYPEMAT) const; +template void SparseMatrix::TSOR (Vector &, + const TYPEMAT) const; +template void SparseMatrix::SSOR (Vector &, + const TYPEMAT) const; +template void SparseMatrix::SOR_step (Vector &, const Vector &, + const TYPEMAT) const; +template void SparseMatrix::TSOR_step (Vector &, + const Vector &, + const TYPEMAT) const; +template void SparseMatrix::SSOR_step (Vector &, + const Vector &, + const TYPEMAT) const; diff --git a/deal.II/lac/source/block_vector.cc b/deal.II/lac/source/block_vector.cc index 7cfb9143dd..9af154837c 100644 --- a/deal.II/lac/source/block_vector.cc +++ b/deal.II/lac/source/block_vector.cc @@ -15,20 +15,28 @@ // explicit instantiations template class BlockVector; -template BlockVector& BlockVector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<>( +template BlockVector& BlockVector::DEAL_II_MEMBER_OP_TEMPLATE_INST 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::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<>( +template BlockVector& BlockVector::DEAL_II_MEMBER_OP_TEMPLATE_INST 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 fbae87cb73..1b215de1c2 100644 --- a/deal.II/lac/source/full_matrix.double.cc +++ b/deal.II/lac/source/full_matrix.double.cc @@ -22,33 +22,43 @@ 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&, +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::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 &, +void FullMatrix::precondition_Jacobi (Vector &, const Vector &, const TYPEMAT) const; @@ -56,28 +66,43 @@ void FullMatrix::precondition_Jacobi<> (Vector &, #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 b33d535478..319cfeb1fe 100644 --- a/deal.II/lac/source/full_matrix.float.cc +++ b/deal.II/lac/source/full_matrix.float.cc @@ -21,51 +21,51 @@ 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 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&, +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::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 &, +void FullMatrix::precondition_Jacobi (Vector &, const Vector &, const TYPEMAT) const; #undef TYPEVEC #define TYPEVEC float -template void FullMatrix::fill_permutation<> (const FullMatrix&, +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::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 &, +void FullMatrix::precondition_Jacobi (Vector &, const Vector &, const TYPEMAT) const; @@ -73,4 +73,4 @@ void FullMatrix::precondition_Jacobi<> (Vector &, #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 626a75b22d..3c5a665871 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 130b599476..771c729e57 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 f844a3d36f..5799d42c14 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 eca7bc5e7d..37911fbbe6 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 3f56b0a68e..0dfa53a884 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::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<>(const Vector&); -template double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator*<>(const Vector&) const; -template double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST 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::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=(const Vector&); +template double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator*(const Vector&) const; +template double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST 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::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<>(const Vector&); -template float Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator*<>(const Vector&) const; -template float Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST 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::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=(const Vector&); +template float Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator*(const Vector&) const; +template float Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST 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 a226706de0..4b01107714 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::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<>(const Vector&); -template Vector& Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<>(const Vector&); -template long double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator *<> (const Vector &) const; -template long double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator *<> (const Vector &) const; -template long double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST 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::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=(const Vector&); +template Vector& Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=(const Vector&); +template long double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator * (const Vector &) const; +template long double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator * (const Vector &) const; +template long double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST 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::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<>(const Vector&); -template double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator *<> (const Vector &) const; -template void Vector::reinit<>(const Vector&, const bool); -template void Vector::equ<>(const double, const Vector&); +template Vector& Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=(const Vector&); +template double Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator * (const Vector &) const; +template void Vector::reinit(const Vector&, const bool); +template void Vector::equ(const double, const Vector&); -template Vector& Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<>(const Vector&); -template float Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator *<> (const Vector &) const; -template void Vector::reinit<>(const Vector&, const bool); -template void Vector::equ<>(const float, const Vector&); +template Vector& Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=(const Vector&); +template float Vector::DEAL_II_MEMBER_OP_TEMPLATE_INST 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