From 3abb05f95c6abca6e375aafe54228d9f9aadc17c Mon Sep 17 00:00:00 2001
From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 4 Sep 2013 14:31:33 +0000
Subject: [PATCH] Rename a variable to be more descriptive.

git-svn-id: https://svn.dealii.org/trunk@30593 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/include/deal.II/hp/dof_levels.h | 10 +++++-----
 deal.II/source/hp/dof_handler.cc        | 12 ++++++------
 deal.II/source/hp/dof_levels.cc         |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/deal.II/include/deal.II/hp/dof_levels.h b/deal.II/include/deal.II/hp/dof_levels.h
index 0f34ab2d45..20da1f5c56 100644
--- a/deal.II/include/deal.II/hp/dof_levels.h
+++ b/deal.II/include/deal.II/hp/dof_levels.h
@@ -76,14 +76,14 @@ namespace internal
 
       /**
        * Store the start index for the degrees of freedom of each
-       * object in the @p dofs array. If the cell corresponding to
+       * object in the @p dof_indices array. If the cell corresponding to
        * a particular index in this array is not active on this level,
        * then we do not store any DoFs for it. In that case, the offset
        * we store here must be an invalid number and indeed we store
        * <code>(std::vector<types::global_dof_index>::size_type)(-1)</code>
        * for it.
        *
-       * The type we store is then obviously the type the @p dofs array
+       * The type we store is then obviously the type the @p dof_indices array
        * uses for indexing.
        */
       std::vector<std::vector<types::global_dof_index>::size_type> dof_offsets;
@@ -93,7 +93,7 @@ namespace internal
        * information. The dof_offsets field determines where each
        * (active) cell's data is stored.
        */
-      std::vector<types::global_dof_index> dofs;
+      std::vector<types::global_dof_index> dof_indices;
 
     public:
 
@@ -221,7 +221,7 @@ namespace internal
 
       Assert (fe_index == active_fe_indices[obj_index],
 	      ExcMessage ("FE index does not match that of the present cell"));
-      return dofs[dof_offsets[obj_index]+local_index];
+      return dof_indices[dof_offsets[obj_index]+local_index];
     }
 
 
@@ -248,7 +248,7 @@ namespace internal
 
       Assert (fe_index == active_fe_indices[obj_index],
 	      ExcMessage ("FE index does not match that of the present cell"));
-      dofs[dof_offsets[obj_index]+local_index] = global_index;
+      dof_indices[dof_offsets[obj_index]+local_index] = global_index;
     }
 
 
diff --git a/deal.II/source/hp/dof_handler.cc b/deal.II/source/hp/dof_handler.cc
index 8a32c2022a..7e8da4ecda 100644
--- a/deal.II/source/hp/dof_handler.cc
+++ b/deal.II/source/hp/dof_handler.cc
@@ -592,7 +592,7 @@ namespace internal
                     next_free_dof += cell->get_fe().dofs_per_line;
                   }
 
-              dof_handler.levels[level]->dofs
+              dof_handler.levels[level]->dof_indices
                 = std::vector<types::global_dof_index> (next_free_dof,
                                                         DoFHandler<dim,spacedim>::invalid_dof_index);
             }
@@ -614,7 +614,7 @@ namespace internal
                 if (!cell->has_children())
                   counter += cell->get_fe().dofs_per_line;
 
-              Assert (dof_handler.levels[level]->dofs.size() == counter,
+              Assert (dof_handler.levels[level]->dof_indices.size() == counter,
                       ExcInternalError());
               Assert (static_cast<unsigned int>
                       (std::count (dof_handler.levels[level]->dof_offsets.begin(),
@@ -709,7 +709,7 @@ namespace internal
                     next_free_dof += cell->get_fe().dofs_per_quad;
                   }
 
-              dof_handler.levels[level]->dofs
+              dof_handler.levels[level]->dof_indices
                 = std::vector<types::global_dof_index> (next_free_dof,
                                                         DoFHandler<dim,spacedim>::invalid_dof_index);
             }
@@ -731,7 +731,7 @@ namespace internal
                 if (!cell->has_children())
                   counter += cell->get_fe().dofs_per_quad;
 
-              Assert (dof_handler.levels[level]->dofs.size() == counter,
+              Assert (dof_handler.levels[level]->dof_indices.size() == counter,
                       ExcInternalError());
               Assert (static_cast<unsigned int>
                       (std::count (dof_handler.levels[level]->dof_offsets.begin(),
@@ -1075,7 +1075,7 @@ namespace internal
                     next_free_dof += cell->get_fe().dofs_per_hex;
                   }
 
-              dof_handler.levels[level]->dofs
+              dof_handler.levels[level]->dof_indices
                 = std::vector<types::global_dof_index> (next_free_dof,
                                                         DoFHandler<dim,spacedim>::invalid_dof_index);
             }
@@ -1097,7 +1097,7 @@ namespace internal
                 if (!cell->has_children())
                   counter += cell->get_fe().dofs_per_hex;
 
-              Assert (dof_handler.levels[level]->dofs.size() == counter,
+              Assert (dof_handler.levels[level]->dof_indices.size() == counter,
                       ExcInternalError());
               Assert (static_cast<unsigned int>
                       (std::count (dof_handler.levels[level]->dof_offsets.begin(),
diff --git a/deal.II/source/hp/dof_levels.cc b/deal.II/source/hp/dof_levels.cc
index 6e28511809..bed6eab33c 100644
--- a/deal.II/source/hp/dof_levels.cc
+++ b/deal.II/source/hp/dof_levels.cc
@@ -28,7 +28,7 @@ namespace internal
     DoFLevel<dim>::memory_consumption () const
     {
       return (MemoryConsumption::memory_consumption (active_fe_indices) +
-	      MemoryConsumption::memory_consumption (dofs) +
+	      MemoryConsumption::memory_consumption (dof_indices) +
               MemoryConsumption::memory_consumption (dof_offsets));
     }
 
-- 
2.39.5