From 0a3662917c0831d89a8a150a784b86cee218e3cf Mon Sep 17 00:00:00 2001 From: heister Date: Fri, 22 Nov 2013 20:22:01 +0000 Subject: [PATCH] inline DoFRenumbering::downstream to fix compilation issue with intel compilers; also remove deprecated MGDoFHandler variant in the process git-svn-id: https://svn.dealii.org/trunk@31766 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/deal.II/dofs/dof_renumbering.h | 36 ++++++++++++------- deal.II/source/dofs/dof_renumbering.cc | 22 ------------ deal.II/source/dofs/dof_renumbering.inst.in | 17 --------- 3 files changed, 23 insertions(+), 52 deletions(-) diff --git a/deal.II/include/deal.II/dofs/dof_renumbering.h b/deal.II/include/deal.II/dofs/dof_renumbering.h index 9484864df3..063ed91f78 100644 --- a/deal.II/include/deal.II/dofs/dof_renumbering.h +++ b/deal.II/include/deal.II/dofs/dof_renumbering.h @@ -891,19 +891,6 @@ namespace DoFRenumbering const Point &direction, const bool dof_wise_renumbering = false); - /** - * This function does the downstream numbering for the individual levels of - * a multigrid hierarchy, but not for the global degrees of freedom. - * - * @deprecated Call downstream() function that takes a level argument for - * each of the levels of the multigrid hierarchy. - */ - template - void - downstream (MGDoFHandler &dof_handler, - const Point &direction, - const bool dof_wise_renumbering = false) DEAL_II_DEPRECATED; - /** * @deprecated Use downstream() instead. */ @@ -1155,6 +1142,29 @@ namespace DoFRenumbering DeclException0 (ExcNotDGFEM); } +/* ------------------------- inline functions -------------- */ + +#ifndef DOXYGEN +namespace DoFRenumbering +{ + template + void + inline + downstream (DH &dof, + const Point &direction, + const bool dof_wise_renumbering) + { + std::vector renumbering(dof.n_dofs()); + std::vector reverse(dof.n_dofs()); + compute_downstream(renumbering, reverse, dof, direction, + dof_wise_renumbering); + + dof.renumber_dofs(renumbering); + } +} +#endif + + DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/source/dofs/dof_renumbering.cc b/deal.II/source/dofs/dof_renumbering.cc index 1dde827f29..60d0453536 100644 --- a/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/source/dofs/dof_renumbering.cc @@ -1515,30 +1515,8 @@ namespace DoFRenumbering - template - void - downstream (DH &dof, - const Point &direction, - const bool dof_wise_renumbering) - { - std::vector renumbering(dof.n_dofs()); - std::vector reverse(dof.n_dofs()); - compute_downstream(renumbering, reverse, dof, direction, - dof_wise_renumbering); - - dof.renumber_dofs(renumbering); - } - template - void - downstream (MGDoFHandler &dof_handler, - const Point &direction, - const bool dof_wise_renumbering) - { - for (unsigned int level=0; level diff --git a/deal.II/source/dofs/dof_renumbering.inst.in b/deal.II/source/dofs/dof_renumbering.inst.in index 2f977adbee..49a0cc5841 100644 --- a/deal.II/source/dofs/dof_renumbering.inst.in +++ b/deal.II/source/dofs/dof_renumbering.inst.in @@ -207,11 +207,6 @@ namespace DoFRenumbering const DoFHandler&, unsigned int, const std::vector::level_cell_iterator>&); - template void - downstream > - (DoFHandler&, const Point::space_dimension>&, - const bool); - template void compute_downstream > (std::vector&,std::vector&, @@ -242,18 +237,6 @@ namespace DoFRenumbering const hp::DoFHandler&, const std::vector::active_cell_iterator>&); - template void - downstream > - (hp::DoFHandler&, - const Point::space_dimension>&, - const bool); - - template void - downstream > - (MGDoFHandler&, - const Point::space_dimension>&, - const bool); - template void downstream > (MGDoFHandler&, -- 2.39.5