inline DoFRenumbering::downstream to fix compilation issue with intel compilers;...

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

diff --git a/deal.II/include/deal.II/dofs/dof_renumbering.h b/deal.II/include/deal.II/dofs/dof_renumbering.h
index 9484864df3de0313800773cb6d5ec96a99e387cd..063ed91f78ee099ee5cdc4cc1be04a94f8831e19 100644 (file)
--- 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<DH::space_dimension>  &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 <int dim, int spacedim>
-  void
-  downstream (MGDoFHandler<dim,spacedim>               &dof_handler,
-              const Point<spacedim> &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 <class DH>
+  void
+  inline
+  downstream (DH &dof,
+              const Point<DH::space_dimension> &direction,
+              const bool dof_wise_renumbering)
+  {
+    std::vector<types::global_dof_index> renumbering(dof.n_dofs());
+    std::vector<types::global_dof_index> 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 1dde827f29a7904a2859f9d7ec37584eddca09cc..60d0453536c80d18afebe979336f15ea8e388988 100644 (file)
--- a/deal.II/source/dofs/dof_renumbering.cc
+++ b/deal.II/source/dofs/dof_renumbering.cc
@@ -1515,30 +1515,8 @@ namespace DoFRenumbering
 
 
 
-  template <class DH>
-  void
-  downstream (DH &dof,
-              const Point<DH::space_dimension> &direction,
-              const bool dof_wise_renumbering)
-  {
-    std::vector<types::global_dof_index> renumbering(dof.n_dofs());
-    std::vector<types::global_dof_index> reverse(dof.n_dofs());
-    compute_downstream(renumbering, reverse, dof, direction,
-                       dof_wise_renumbering);
-
-    dof.renumber_dofs(renumbering);
-  }
 
 
-  template <int dim, int spacedim>
-  void
-  downstream (MGDoFHandler<dim,spacedim>               &dof_handler,
-              const Point<spacedim> &direction,
-              const bool        dof_wise_renumbering)
-  {
-    for (unsigned int level=0; level<dof_handler.n_levels(); ++level)
-      downstream(dof_handler, level, direction, dof_wise_renumbering);
-  }
 
 
   template <class DH>

diff --git a/deal.II/source/dofs/dof_renumbering.inst.in b/deal.II/source/dofs/dof_renumbering.inst.in
index 2f977adbee8f3e8c4b0906691b036e486d31f9c3..49a0cc5841e649d8eb98d937be05f270c2393086 100644 (file)
--- 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<deal_II_dimension>&, unsigned int,
        const std::vector<DoFHandler<deal_II_dimension>::level_cell_iterator>&);
 
-    template void
-      downstream<DoFHandler<deal_II_dimension> >
-      (DoFHandler<deal_II_dimension>&, const Point<DoFHandler<deal_II_dimension>::space_dimension>&,
-       const bool);
-
     template void
       compute_downstream<DoFHandler<deal_II_dimension> >
       (std::vector<types::global_dof_index>&,std::vector<types::global_dof_index>&,
@@ -242,18 +237,6 @@ namespace DoFRenumbering
        const hp::DoFHandler<deal_II_dimension>&,
        const std::vector<hp::DoFHandler<deal_II_dimension>::active_cell_iterator>&);
 
-    template void
-      downstream<hp::DoFHandler<deal_II_dimension> >
-      (hp::DoFHandler<deal_II_dimension>&,
-       const Point<hp::DoFHandler<deal_II_dimension>::space_dimension>&,
-       const bool);
-
-    template void
-      downstream<MGDoFHandler<deal_II_dimension> >
-      (MGDoFHandler<deal_II_dimension>&,
-       const Point<MGDoFHandler<deal_II_dimension>::space_dimension>&,
-       const bool);
-
     template void
       downstream<MGDoFHandler<deal_II_dimension> >
       (MGDoFHandler<deal_II_dimension>&,