Convert to types::global_dof_index and fix a significant number of places

where function arguments were simply using single letters that gave away
absolutely nothing as to what their meaning might be (and no indication in the
documentation either...).

git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@27530 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/meshworker/dof_info.h b/deal.II/include/deal.II/meshworker/dof_info.h
index e21467e5dd2ff73e0f38958b34b49db87de6a213..0e8b28a3c0e1bf9f3bf1119aa099aa73c3a786cf 100644 (file)
--- a/deal.II/include/deal.II/meshworker/dof_info.h
+++ b/deal.II/include/deal.II/meshworker/dof_info.h
@@ -97,14 +97,14 @@ namespace MeshWorker
                                         * The DoF indices of the
                                         * current cell
                                         */
-      std::vector<unsigned int> indices;
+      std::vector<types::global_dof_index> indices;
 
                                        /**
                                         * The DoF indices on the
                                         * current cell, organized by
                                         * local blocks
                                         */
-      std::vector<std::vector<unsigned int> > indices_by_block;
+      std::vector<std::vector<types::global_dof_index> > indices_by_block;
 
                                        /**
                                         * Constructor setting the
@@ -136,7 +136,7 @@ namespace MeshWorker
       template <class DHCellIterator, class DHFaceIterator>
       void reinit(const DHCellIterator& c,
                   const DHFaceIterator& f,
-                  const unsigned int n);
+                  const unsigned int face_no);
 
                                        /**
                                         * Set the current subface
@@ -146,8 +146,8 @@ namespace MeshWorker
       template <class DHCellIterator, class DHFaceIterator>
       void reinit(const DHCellIterator& c,
                   const DHFaceIterator& f,
-                  const unsigned int n,
-                  const unsigned int s);
+                  const unsigned int face_no,
+                  const unsigned int subface_no);
 
                                        /**
                                         * Switch to a new face of the
@@ -157,7 +157,7 @@ namespace MeshWorker
                                         */
       template <class DHFaceIterator>
       void set_face (const DHFaceIterator& f,
-                     const unsigned int n);
+                     const unsigned int face_no);
                                        /**
                                         * Switch to a new subface of the
                                         * same cell. Does not change
@@ -166,8 +166,8 @@ namespace MeshWorker
                                         */
       template <class DHFaceIterator>
       void set_subface (const DHFaceIterator& f,
-                        const unsigned int n,
-                        const unsigned int s);
+                        const unsigned int face_no,
+                        const unsigned int subface_no);
 
       const BlockIndices& local_indices() const;
 
@@ -197,7 +197,7 @@ namespace MeshWorker
       void get_indices(const typename MGDoFHandler<dim, spacedim>::cell_iterator& c);
 
                                        /// Auxiliary vector
-      std::vector<unsigned int> indices_org;
+      std::vector<types::global_dof_index> indices_org;
 
                                        /**
                                         * An auxiliary local
@@ -324,10 +324,10 @@ namespace MeshWorker
   inline void
   DoFInfo<dim,spacedim,number>::set_face(
     const DHFaceIterator& f,
-    unsigned int n)
+    const unsigned int face_no)
   {
     face = static_cast<typename Triangulation<dim>::face_iterator> (f);
-    face_number = n;
+    face_number = face_no;
     sub_number = deal_II_numbers::invalid_unsigned_int;
   }
 
@@ -338,13 +338,13 @@ namespace MeshWorker
   DoFInfo<dim,spacedim,number>::reinit(
     const DHCellIterator& c,
     const DHFaceIterator& f,
-    unsigned int n)
+    const unsigned int face_no)
   {
     if ((cell.state() != IteratorState::valid)
         ||  cell != static_cast<typename Triangulation<dim>::cell_iterator> (c))
       get_indices(c);
     cell = static_cast<typename Triangulation<dim>::cell_iterator> (c);
-    set_face(f,n);
+    set_face(f, face_no);
 
     if (block_info)
       LocalResults<number>::reinit(block_info->local());
@@ -358,12 +358,12 @@ namespace MeshWorker
   inline void
   DoFInfo<dim,spacedim,number>::set_subface(
     const DHFaceIterator& f,
-    unsigned int n,
-    unsigned int s)
+    const unsigned int face_no,
+    const unsigned int subface_no)
   {
     face = static_cast<typename Triangulation<dim>::face_iterator> (f);
-    face_number = n;
-    sub_number = s;
+    face_number = face_no;
+    sub_number = subface_no;
   }
 
 
@@ -373,14 +373,14 @@ namespace MeshWorker
   DoFInfo<dim,spacedim,number>::reinit(
     const DHCellIterator& c,
     const DHFaceIterator& f,
-    unsigned int n,
-    unsigned int s)
+    const unsigned int face_no,
+    const unsigned int subface_no)
   {
     if (cell.state() != IteratorState::valid
         || cell != static_cast<typename Triangulation<dim>::cell_iterator> (c))
       get_indices(c);
     cell = static_cast<typename Triangulation<dim>::cell_iterator> (c);
-    set_subface(f,n,s);
+    set_subface(f, face_no, subface_no);
 
     if (block_info)
       LocalResults<number>::reinit(block_info->local());