Merge pull request #5219 from tjhei/2.5-particle-ref-bug

[2.5] particle ref bug
geodynamics · Jul 8, 2023 · efcf64a · efcf64a
2 parents f9180d6 + b1ad15a
commit efcf64a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/source/particle/property/integrated_strain.cc b/source/particle/property/integrated_strain.cc
@@ -43,7 +43,7 @@ namespace aspect
                                                       const std::vector<Tensor<1,dim>> &gradients,
                                                       typename ParticleHandler<dim>::particle_iterator &particle) const
       {
-        auto &data = particle->get_properties();
+        const auto data = particle->get_properties();
 
         Tensor<2,dim> old_strain;
         for (unsigned int i = 0; i < Tensor<2,dim>::n_independent_components ; ++i)

diff --git a/source/particle/property/integrated_strain_invariant.cc b/source/particle/property/integrated_strain_invariant.cc
@@ -44,7 +44,7 @@ namespace aspect
                                                                typename ParticleHandler<dim>::particle_iterator &particle) const
       {
         // Integrated strain invariant from prior time step
-        auto &data = particle->get_properties();
+        const auto data = particle->get_properties();
         double old_strain = data[data_position];
 
         // Current timestep

diff --git a/source/particle/property/strain_rate.cc b/source/particle/property/strain_rate.cc
@@ -46,7 +46,7 @@ namespace aspect
                                                 const std::vector<Tensor<1,dim>> &gradients,
                                                 typename ParticleHandler<dim>::particle_iterator &particle) const
       {
-        auto &data = particle->get_properties();
+        const auto data = particle->get_properties();
         // Velocity gradients
         Tensor<2,dim> grad_u;
         for (unsigned int d=0; d<dim; ++d)

diff --git a/source/particle/property/viscoplastic_strain_invariants.cc b/source/particle/property/viscoplastic_strain_invariants.cc
@@ -130,7 +130,7 @@ namespace aspect
         const bool plastic_yielding = viscoplastic.is_yielding(material_inputs);
 
         // Next take the integrated strain invariant from the prior time step.
-        auto &data = particle->get_properties();
+        const auto data = particle->get_properties();
 
         // Calculate strain rate second invariant
         const double edot_ii = std::sqrt(std::max(-second_invariant(deviator(material_inputs.strain_rate[0])), 0.));