]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Add spacedim parameter to renumbering function
authorfsonner <florian.sonner@iwr.uni-heidelberg.de>
Fri, 24 Apr 2015 16:00:04 +0000 (18:00 +0200)
committerTimo Heister <timo.heister@gmail.com>
Thu, 30 Apr 2015 20:36:24 +0000 (16:36 -0400)
include/deal.II/dofs/dof_renumbering.h
source/dofs/dof_renumbering.cc

index be688f48dc83076c2c27862f9d8987efad5ca44b..f95a3786e57453bf14b5195484ff747f27e66923 100644 (file)
@@ -683,9 +683,9 @@ namespace DoFRenumbering
    * number of blocks and that subsequent blocks in one element have the same
    * meaning as in another element.
    */
-  template <int dim>
+  template <int dim, int spacedim>
   void
-  block_wise (hp::DoFHandler<dim> &dof_handler);
+  block_wise (hp::DoFHandler<dim,spacedim> &dof_handler);
 
   /**
    * Computes the renumbering vector needed by the block_wise() functions.
index e317bec83736cb3823ceabd756e789ba0b84727b..ada24eda1fb6cd0be5687a120292698ea09685f2 100644 (file)
@@ -864,22 +864,22 @@ namespace DoFRenumbering
 
 
 
-  template <int dim>
+  template <int dim, int spacedim>
   void
-  block_wise (hp::DoFHandler<dim> &dof_handler)
+  block_wise (hp::DoFHandler<dim,spacedim> &dof_handler)
   {
     std::vector<types::global_dof_index> renumbering (dof_handler.n_dofs(),
-                                                      hp::DoFHandler<dim>::invalid_dof_index);
+                                                      hp::DoFHandler<dim,spacedim>::invalid_dof_index);
 
-    typename hp::DoFHandler<dim>::active_cell_iterator
+    typename hp::DoFHandler<dim,spacedim>::active_cell_iterator
     start = dof_handler.begin_active();
-    const typename hp::DoFHandler<dim>::level_cell_iterator
+    const typename hp::DoFHandler<dim,spacedim>::level_cell_iterator
     end = dof_handler.end();
 
     const types::global_dof_index result =
-      compute_block_wise<dim, dim, typename hp::DoFHandler<dim>::active_cell_iterator,
-      typename hp::DoFHandler<dim>::level_cell_iterator>(renumbering,
-                                                         start, end, false);
+      compute_block_wise<dim, spacedim, typename hp::DoFHandler<dim,spacedim>::active_cell_iterator,
+      typename hp::DoFHandler<dim,spacedim>::level_cell_iterator>(renumbering,
+          start, end, false);
 
     if (result == 0)
       return;
@@ -1000,7 +1000,7 @@ namespace DoFRenumbering
           if (start->get_dof_handler().locally_owned_dofs().is_element(local_dof_indices[i]))
             block_to_dof_map[block_list[fe_index][i]].
             push_back (local_dof_indices[i]);
-    }
+      }
 
     // now we've got all indices sorted
     // into buckets labeled by their

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.