Rename a private member variable.

diff --git a/include/deal.II/particles/particle_handler.h b/include/deal.II/particles/particle_handler.h
index ade085a03debfa89faa42bbdb2e3505f6e672e89..c6fd1fde6c3bb9cbebd3082f5ad5d05c1c551cee 100644 (file)
--- a/include/deal.II/particles/particle_handler.h
+++ b/include/deal.II/particles/particle_handler.h
@@ -884,7 +884,8 @@ namespace Particles
      */
     particle_iterator
     insert_particle(
-      const typename PropertyPool<dim, spacedim>::Handle          handle,
+      const typename PropertyPool<dim, spacedim>::Handle
+        tria_attached_data_index,
       const typename Triangulation<dim, spacedim>::cell_iterator &cell);
 
     /**
@@ -1013,7 +1014,7 @@ namespace Particles
      * to check where the particle data was registered in the corresponding
      * triangulation object.
      */
-    unsigned int handle;
+    unsigned int tria_attached_data_index;
 
     /**
      * Tolerance to be used for GeometryInfo<dim>::is_inside_cell().

diff --git a/source/particles/particle_handler.cc b/source/particles/particle_handler.cc
index 5e760fbec1dd1714fabc9254b46ccd4839f978e9..1ae650e2e17f44ade2dca03dc6d7866ac9dba421 100644 (file)
--- a/source/particles/particle_handler.cc
+++ b/source/particles/particle_handler.cc
@@ -65,7 +65,7 @@ namespace Particles
     , size_callback()
     , store_callback()
     , load_callback()
-    , handle(numbers::invalid_unsigned_int)
+    , tria_attached_data_index(numbers::invalid_unsigned_int)
     , tria_listeners()
   {
     reset_particle_container(particles);
@@ -89,7 +89,7 @@ namespace Particles
     , size_callback()
     , store_callback()
     , load_callback()
-    , handle(numbers::invalid_unsigned_int)
+    , tria_attached_data_index(numbers::invalid_unsigned_int)
     , triangulation_cache(
         std::make_unique<GridTools::Cache<dim, spacedim>>(triangulation,
                                                           mapping))
@@ -181,7 +181,7 @@ namespace Particles
 
     ghost_particles_cache.ghost_particles_by_domain =
       particle_handler.ghost_particles_cache.ghost_particles_by_domain;
-    handle = particle_handler.handle;
+    tria_attached_data_index = particle_handler.tria_attached_data_index;
   }
 
 
@@ -2201,9 +2201,10 @@ namespace Particles
         return this->pack_callback(cell_iterator, cell_status);
       };
 
-    handle = const_cast<Triangulation<dim, spacedim> *>(&*triangulation)
-               ->register_data_attach(callback_function,
-                                      /*returns_variable_size_data=*/true);
+    tria_attached_data_index =
+      const_cast<Triangulation<dim, spacedim> *>(&*triangulation)
+        ->register_data_attach(callback_function,
+                               /*returns_variable_size_data=*/true);
   }
 
 
@@ -2253,7 +2254,7 @@ namespace Particles
       register_data_attach();
 
     // Check if something was stored and load it
-    if (handle != numbers::invalid_unsigned_int)
+    if (tria_attached_data_index != numbers::invalid_unsigned_int)
       {
         const auto callback_function =
           [this](const typename Triangulation<dim, spacedim>::cell_iterator
@@ -2265,10 +2266,10 @@ namespace Particles
           };
 
         const_cast<Triangulation<dim, spacedim> *>(&*triangulation)
-          ->notify_ready_to_unpack(handle, callback_function);
+          ->notify_ready_to_unpack(tria_attached_data_index, callback_function);
 
         // Reset handle and update global numbers.
-        handle = numbers::invalid_unsigned_int;
+        tria_attached_data_index = numbers::invalid_unsigned_int;
         update_cached_numbers();
       }
   }