From cc0679b2499347ea1fd02f2940c7343fb9489a56 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 18 Jul 2024 21:43:57 -0600 Subject: [PATCH] Rename a private member variable. --- include/deal.II/particles/particle_handler.h | 5 +++-- source/particles/particle_handler.cc | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/deal.II/particles/particle_handler.h b/include/deal.II/particles/particle_handler.h index ade085a03d..c6fd1fde6c 100644 --- 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::Handle handle, + const typename PropertyPool::Handle + tria_attached_data_index, const typename Triangulation::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::is_inside_cell(). diff --git a/source/particles/particle_handler.cc b/source/particles/particle_handler.cc index 5e760fbec1..1ae650e2e1 100644 --- 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>(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) - ->register_data_attach(callback_function, - /*returns_variable_size_data=*/true); + tria_attached_data_index = + const_cast *>(&*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::cell_iterator @@ -2265,10 +2266,10 @@ namespace Particles }; const_cast *>(&*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(); } } -- 2.39.5