From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Tue, 20 Oct 2020 01:26:43 +0000 (-0600)
Subject: Rename a local variable.
X-Git-Tag: v9.3.0-rc1~997^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=844598133c9a3053f305b2875b99884697e12c78;p=dealii.git

Rename a local variable.
---

diff --git a/source/particles/particle.cc b/source/particles/particle.cc
index d3568e0330..69f16624cd 100644
--- a/source/particles/particle.cc
+++ b/source/particles/particle.cc
@@ -238,25 +238,26 @@ namespace Particles
   {
     Assert(property_pool != nullptr, ExcInternalError());
 
+    // If we haven't allocated memory yet, do so now
     if (properties == PropertyPool::invalid_handle)
       properties = property_pool->allocate_properties_array();
 
-    const ArrayView<double> old_properties =
+    const ArrayView<double> property_values =
       property_pool->get_properties(properties);
 
-    Assert(new_properties.size() == old_properties.size(),
+    Assert(new_properties.size() == property_values.size(),
            ExcMessage(
              "You are trying to assign properties with an incompatible length. "
              "The particle has space to store " +
-             std::to_string(old_properties.size()) +
+             std::to_string(property_values.size()) +
              " properties, but you are trying to assign " +
              std::to_string(new_properties.size()) +
              " properties. This is not allowed."));
 
-    if (old_properties.size() > 0)
+    if (property_values.size() > 0)
       std::copy(new_properties.begin(),
                 new_properties.end(),
-                old_properties.begin());
+                property_values.begin());
   }