Templatize DoFRenumbering::subdomain_wise and corresponding compute_* function on...

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

diff --git a/deal.II/deal.II/include/dofs/dof_renumbering.h b/deal.II/deal.II/include/dofs/dof_renumbering.h
index a85a2bd14453bc97d6c4c345c8fd94255494a961..522ab8e3cc5077f30d0a2293b001fe03387adde2 100644 (file)
--- a/deal.II/deal.II/include/dofs/dof_renumbering.h
+++ b/deal.II/deal.II/include/dofs/dof_renumbering.h
@@ -1115,9 +1115,9 @@ namespace DoFRenumbering
                                    * will be in this order also after
                                    * reordering.
                                    */
-  template <int dim>
+  template <class DH>
   void
-  subdomain_wise (DoFHandler<dim> &dof_handler);
+  subdomain_wise (DH &dof_handler);
 
                                   /**
                                    * Computes the renumbering
@@ -1128,10 +1128,10 @@ namespace DoFRenumbering
                                    * DoFHandler dofs but returns
                                    * the renumbering vector.
                                    */   
-  template <int dim>
+  template <class DH>
   void
   compute_subdomain_wise (std::vector<unsigned int> &new_dof_indices,
-                         const DoFHandler<dim>     &dof_handler);
+                         const DH                  &dof_handler);
     
                                   /**
                                    * Exception

diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc
index b38a596eabaac8f0e04159c18fe1451ca8770267..e53a2b9f5b8b1b2c0b79c9b9fa8107e62b51c447 100644 (file)
--- a/deal.II/deal.II/source/dofs/dof_renumbering.cc
+++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc
@@ -1791,12 +1791,12 @@ namespace DoFRenumbering
 
 
 
-  template <int dim>
+  template <class DH>
   void
-  subdomain_wise (DoFHandler<dim> &dof_handler)
+  subdomain_wise (DH &dof_handler)
   {
     std::vector<unsigned int> renumbering(dof_handler.n_dofs(),
-                                         DoFHandler<dim>::invalid_dof_index);
+                                         DH::invalid_dof_index);
     compute_subdomain_wise(renumbering, dof_handler);
 
     dof_handler.renumber_dofs(renumbering);
@@ -1804,10 +1804,10 @@ namespace DoFRenumbering
 
   
 
-  template <int dim>
+  template <class DH>
   void
   compute_subdomain_wise (std::vector<unsigned int> &new_dof_indices,
-                         const DoFHandler<dim>     &dof_handler)
+                         const DH                  &dof_handler)
   {
     const unsigned int n_dofs = dof_handler.n_dofs();
     Assert (new_dof_indices.size() == n_dofs,
@@ -2142,14 +2142,12 @@ namespace DoFRenumbering
    const std::vector<bool> &);
 
   template
-  void subdomain_wise<deal_II_dimension>
+  void subdomain_wise<DoFHandler<deal_II_dimension> >
   (DoFHandler<deal_II_dimension> &);
 
   template
-  void
-  compute_subdomain_wise<deal_II_dimension>
-  (std::vector<unsigned int>&,
-   const DoFHandler<deal_II_dimension> &);
+  void subdomain_wise<hp::DoFHandler<deal_II_dimension> >
+  (hp::DoFHandler<deal_II_dimension> &);
 
   template
   void Cuthill_McKee<deal_II_dimension>