Replace present_index by index() in DoFAccessor

diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h
index b6f11ba067ca1c04deab5096a5d2ccf7dd768ce0..2db49b429334e6318e81f65e9630fe306d2f5813 100644 (file)
--- a/include/deal.II/dofs/dof_accessor.templates.h
+++ b/include/deal.II/dofs/dof_accessor.templates.h
@@ -1462,7 +1462,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::dof_index(
   return dealii::internal::DoFAccessorImplementation::Implementation::
     get_dof_index(*this->dof_handler,
                   this->level(),
-                  this->present_index,
+                  this->index(),
                   fe_index,
                   i,
                   std::integral_constant<int, structdim>());
@@ -1475,8 +1475,10 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::mg_dof_index(
   const int          level,
   const unsigned int i) const
 {
-  return this->dof_handler->template get_dof_index<structdim>(
-    level, this->present_index, 0, i);
+  return this->dof_handler->template get_dof_index<structdim>(level,
+                                                              this->index(),
+                                                              0,
+                                                              i);
 }
 
 
@@ -1497,7 +1499,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::set_dof_index(
   dealii::internal::DoFAccessorImplementation::Implementation::set_dof_index(
     *this->dof_handler,
     this->level(),
-    this->present_index,
+    this->index(),
     fe_index,
     i,
     std::integral_constant<int, structdim>(),
@@ -1515,7 +1517,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::n_active_fe_indices()
   return dealii::internal::DoFAccessorImplementation::Implementation::
     n_active_fe_indices(*this->dof_handler,
                         this->level(),
-                        this->present_index,
+                        this->index(),
                         std::integral_constant<int, structdim>());
 }
 
@@ -1530,7 +1532,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::nth_active_fe_index(
   return dealii::internal::DoFAccessorImplementation::Implementation::
     nth_active_fe_index(*this->dof_handler,
                         this->level(),
-                        this->present_index,
+                        this->index(),
                         n,
                         std::integral_constant<int, structdim>());
 }
@@ -1559,7 +1561,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::fe_index_is_active(
   return dealii::internal::DoFAccessorImplementation::Implementation::
     fe_index_is_active(*this->dof_handler,
                        this->level(),
-                       this->present_index,
+                       this->index(),
                        fe_index,
                        std::integral_constant<int, structdim>());
 }
@@ -1677,7 +1679,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::set_mg_dof_index(
   const types::global_dof_index index) const
 {
   this->dof_handler->template set_dof_index<structdim>(
-    level, this->present_index, 0, i, index);
+    level, this->index(), 0, i, index);
 }
 
 
@@ -2629,12 +2631,9 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::
   const auto dofs_per_cell = this->get_fe().n_dofs_per_cell();
   if (dofs_per_cell > 0)
     {
-      const types::global_dof_index *cache =
-        dealii::internal::DoFAccessorImplementation::Implementation::
-          get_cache_ptr(this->dof_handler,
-                        this->present_level,
-                        this->present_index,
-                        dofs_per_cell);
+      const types::global_dof_index *cache = dealii::internal::
+        DoFAccessorImplementation::Implementation::get_cache_ptr(
+          this->dof_handler, this->present_level, this->index(), dofs_per_cell);
       for (unsigned int i = 0; i < dofs_per_cell; ++i, ++cache)
         dof_indices[i] = *cache;
     }
@@ -2720,7 +2719,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::get_dof_values(
     dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
       this->dof_handler,
       this->present_level,
-      this->present_index,
+      this->index(),
       this->get_fe().n_dofs_per_cell());
   dealii::internal::DoFAccessorImplementation::Implementation::
     extract_subvector_to(values,
@@ -2755,7 +2754,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::get_dof_values(
     dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
       this->dof_handler,
       this->present_level,
-      this->present_index,
+      this->index(),
       this->get_fe().n_dofs_per_cell());
 
   constraints.get_dof_values(values,
@@ -2789,7 +2788,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::set_dof_values(
     dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
       this->dof_handler,
       this->present_level,
-      this->present_index,
+      this->index(),
       this->get_fe().n_dofs_per_cell());
 
   for (unsigned int i = 0; i < this->get_fe().n_dofs_per_cell(); ++i, ++cache)
@@ -3016,7 +3015,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::
 
   const types::global_dof_index *dofs =
     dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
-      this->dof_handler, this->level(), this->present_index, n_dofs);
+      this->dof_handler, this->level(), this->index(), n_dofs);
 
   // distribute cell vector
   global_destination.add(n_dofs, dofs, local_source_begin);
@@ -3048,7 +3047,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::
 
   const types::global_dof_index *dofs =
     dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
-      this->dof_handler, this->level(), this->present_index, n_dofs);
+      this->dof_handler, this->level(), this->index(), n_dofs);
 
   // distribute cell vector
   constraints.distribute_local_to_global(local_source_begin,
@@ -3083,7 +3082,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::
 
   const types::global_dof_index *dofs =
     dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
-      this->dof_handler, this->level(), this->present_index, n_dofs);
+      this->dof_handler, this->level(), this->index(), n_dofs);
 
   // distribute cell matrix
   for (unsigned int i = 0; i < n_dofs; ++i)
@@ -3121,7 +3120,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::
   const unsigned int             n_dofs = this->get_fe().n_dofs_per_cell();
   const types::global_dof_index *dofs =
     dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
-      this->dof_handler, this->level(), this->present_index, n_dofs);
+      this->dof_handler, this->level(), this->index(), n_dofs);
 
   // distribute cell matrices
   for (unsigned int i = 0; i < n_dofs; ++i)