Make particle iterators const references.

diff --git a/tests/particles/particle_handler_01.cc b/tests/particles/particle_handler_01.cc
index e201a525b16bcab3de40422171929ddd6a21a682..e99efe8d3ce216b417578d3fe4ed32343bb9bb03 100644 (file)
--- a/tests/particles/particle_handler_01.cc
+++ b/tests/particles/particle_handler_01.cc
@@ -76,14 +76,12 @@ test()
     deallog << "Particle number: " << particle_handler.n_global_particles()
             << std::endl;
 
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
+    for (const auto &particle : particle_handler)
       {
-        deallog << "Particle location: " << particle->get_location()
+        deallog << "Particle location: " << particle.get_location()
                 << std::endl;
         deallog << "Particle reference location: "
-                << particle->get_reference_location() << std::endl;
+                << particle.get_reference_location() << std::endl;
       }
   }
 

diff --git a/tests/particles/particle_handler_02.cc b/tests/particles/particle_handler_02.cc
index b1de99be3b3eeafcb0247acb8d28fcd69f9299aa..d691ca0f5d1e8241be6f9036c33e0b4a21bf76fa 100644 (file)
--- a/tests/particles/particle_handler_02.cc
+++ b/tests/particles/particle_handler_02.cc
@@ -94,14 +94,12 @@ test()
     deallog << "Max particles per cell: "
             << particle_handler.n_global_max_particles_per_cell() << std::endl;
 
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
+    for (const auto &particle : particle_handler)
       {
-        deallog << "Particle location: " << particle->get_location()
+        deallog << "Particle location: " << particle.get_location()
                 << std::endl;
         deallog << "Particle reference location: "
-                << particle->get_reference_location() << std::endl;
+                << particle.get_reference_location() << std::endl;
       }
   }
 

diff --git a/tests/particles/particle_handler_03.cc b/tests/particles/particle_handler_03.cc
index 4ff11ba9cb563cb891e335983de334d071f5e594..9f0f67e0b04a84cf3a04e3ea1b0dfb1139b5d229 100644 (file)
--- a/tests/particles/particle_handler_03.cc
+++ b/tests/particles/particle_handler_03.cc
@@ -67,20 +67,16 @@ test()
     particle_handler.insert_particle(particle1, cell1);
     particle_handler.insert_particle(particle2, cell2);
 
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
-      deallog << "Before sort particle id " << particle->get_id()
-              << " is in cell " << particle->get_surrounding_cell(tr)
+    for (const auto &particle : particle_handler)
+      deallog << "Before sort particle id " << particle.get_id()
+              << " is in cell " << particle.get_surrounding_cell(tr)
               << std::endl;
 
     particle_handler.sort_particles_into_subdomains_and_cells();
 
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
-      deallog << "After sort particle id " << particle->get_id()
-              << " is in cell " << particle->get_surrounding_cell(tr)
+    for (const auto &particle : particle_handler)
+      deallog << "After sort particle id " << particle.get_id()
+              << " is in cell " << particle.get_surrounding_cell(tr)
               << std::endl;
 
     // Move all points up by 0.5. This will change cell for particle 1, and will
@@ -88,17 +84,13 @@ test()
     // coordinate dim-1 despite having a spacedim point.
     Point<spacedim> shift;
     shift(dim - 1) = 0.5;
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
-      particle->set_location(particle->get_location() + shift);
+    for (auto &particle : particle_handler)
+      particle.set_location(particle.get_location() + shift);
 
     particle_handler.sort_particles_into_subdomains_and_cells();
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
-      deallog << "After shift particle id " << particle->get_id()
-              << " is in cell " << particle->get_surrounding_cell(tr)
+    for (const auto &particle : particle_handler)
+      deallog << "After shift particle id " << particle.get_id()
+              << " is in cell " << particle.get_surrounding_cell(tr)
               << std::endl;
   }
 

diff --git a/tests/particles/particle_handler_04.cc b/tests/particles/particle_handler_04.cc
index 5839a45cebb62d37c956f14782798eb4a4c55142..95a5cec8e898133be5fb4917649441b14b8af6e4 100644 (file)
--- a/tests/particles/particle_handler_04.cc
+++ b/tests/particles/particle_handler_04.cc
@@ -72,11 +72,9 @@ test()
         particle_handler.insert_particle(particle1, cell1);
         particle_handler.insert_particle(particle2, cell2);
 
-        for (auto particle = particle_handler.begin();
-             particle != particle_handler.end();
-             ++particle)
-          deallog << "Before sort particle id " << particle->get_id()
-                  << " is in cell " << particle->get_surrounding_cell(tr)
+        for (const auto &particle : particle_handler)
+          deallog << "Before sort particle id " << particle.get_id()
+                  << " is in cell " << particle.get_surrounding_cell(tr)
                   << " on process "
                   << Utilities::MPI::this_mpi_process(tr.get_communicator())
                   << std::flush << std::endl;
@@ -86,11 +84,9 @@ test()
 
     particle_handler.sort_particles_into_subdomains_and_cells();
 
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
-      deallog << "After sort particle id " << particle->get_id()
-              << " is in cell " << particle->get_surrounding_cell(tr)
+    for (const auto &particle : particle_handler)
+      deallog << "After sort particle id " << particle.get_id()
+              << " is in cell " << particle.get_surrounding_cell(tr)
               << " on process "
               << Utilities::MPI::this_mpi_process(tr.get_communicator())
               << std::flush << std::endl;
@@ -100,17 +96,13 @@ test()
     // coordinate dim-1 despite having a spacedim point.
     Point<spacedim> shift;
     shift(dim - 1) = 0.5;
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
-      particle->set_location(particle->get_location() + shift);
+    for (auto &particle : particle_handler)
+      particle.set_location(particle.get_location() + shift);
 
     particle_handler.sort_particles_into_subdomains_and_cells();
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
-      deallog << "After shift particle id " << particle->get_id()
-              << " is in cell " << particle->get_surrounding_cell(tr)
+    for (const auto &particle : particle_handler)
+      deallog << "After shift particle id " << particle.get_id()
+              << " is in cell " << particle.get_surrounding_cell(tr)
               << " on process "
               << Utilities::MPI::this_mpi_process(tr.get_communicator())
               << std::flush << std::endl;

diff --git a/tests/particles/particle_handler_05.cc b/tests/particles/particle_handler_05.cc
index 11f46fbab47ba6f918c82d52d92131c6ad5f2960..b6251951ce8109c4e2871f4e198891ad4b65b616 100644 (file)
--- a/tests/particles/particle_handler_05.cc
+++ b/tests/particles/particle_handler_05.cc
@@ -116,21 +116,17 @@ test()
 
     create_regular_particle_distribution(particle_handler, tr);
 
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
-      deallog << "Before refinement particle id " << particle->get_id()
-              << " is in cell " << particle->get_surrounding_cell(tr)
+    for (const auto &particle : particle_handler)
+      deallog << "Before refinement particle id " << particle.get_id()
+              << " is in cell " << particle.get_surrounding_cell(tr)
               << std::endl;
 
     // Check that all particles are moved to children
     tr.refine_global(1);
 
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
-      deallog << "After refinement particle id " << particle->get_id()
-              << " is in cell " << particle->get_surrounding_cell(tr)
+    for (const auto &particle : particle_handler)
+      deallog << "After refinement particle id " << particle.get_id()
+              << " is in cell " << particle.get_surrounding_cell(tr)
               << std::endl;
 
     // Reverse the refinement and check again
@@ -139,11 +135,9 @@ test()
 
     tr.execute_coarsening_and_refinement();
 
-    for (auto particle = particle_handler.begin();
-         particle != particle_handler.end();
-         ++particle)
-      deallog << "After coarsening particle id " << particle->get_id()
-              << " is in cell " << particle->get_surrounding_cell(tr)
+    for (const auto &particle : particle_handler)
+      deallog << "After coarsening particle id " << particle.get_id()
+              << " is in cell " << particle.get_surrounding_cell(tr)
               << std::endl;
   }