From: blaisb <blais.bruno@gmail.com>
Date: Sat, 30 May 2020 13:09:39 +0000 (-0400)
Subject: Fixed the order of the properties in the generator
X-Git-Tag: v9.3.0-rc1~1505^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=523e2da39ff649bd0e700fbb44f09b6bcd5ced90;p=dealii.git

Fixed the order of the properties in the generator
Added missing properties in call to insert_global_particles
---

diff --git a/include/deal.II/particles/generators.h b/include/deal.II/particles/generators.h
index 11cb6f56bc..bd3887a7c2 100644
--- a/include/deal.II/particles/generators.h
+++ b/include/deal.II/particles/generators.h
@@ -210,9 +210,9 @@ namespace Particles
                        ParticleHandler<dim, spacedim> &particle_handler,
                        const Mapping<dim, spacedim> &  mapping =
                          StaticMappingQ1<dim, spacedim>::mapping,
+                       const ComponentMask &components = ComponentMask(),
                        const std::vector<std::vector<double>> &properties =
-                         std::vector<std::vector<double>>(),
-                       const ComponentMask &components = ComponentMask());
+                         std::vector<std::vector<double>>());
 
     /**
      * A function that generates particles at the locations of the quadrature
diff --git a/source/particles/generators.cc b/source/particles/generators.cc
index da677b7552..331b2aa38e 100644
--- a/source/particles/generators.cc
+++ b/source/particles/generators.cc
@@ -409,8 +409,8 @@ namespace Particles
                          &                             global_bounding_boxes,
                        ParticleHandler<dim, spacedim> &particle_handler,
                        const Mapping<dim, spacedim> &  mapping,
-                       const std::vector<std::vector<double>> &properties,
-                       const ComponentMask &                   components)
+                       const ComponentMask &           components,
+                       const std::vector<std::vector<double>> &properties)
     {
       const auto &fe = dof_handler.get_fe();
 
@@ -471,7 +471,8 @@ namespace Particles
             }
         }
       particle_handler.insert_global_particles(points_to_generate,
-                                               global_bounding_boxes);
+                                               global_bounding_boxes,
+                                               properties);
     }
   } // namespace Generators
 } // namespace Particles
diff --git a/source/particles/generators.inst.in b/source/particles/generators.inst.in
index 51d92313c5..7ea80d0e1a 100644
--- a/source/particles/generators.inst.in
+++ b/source/particles/generators.inst.in
@@ -61,8 +61,8 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
           ParticleHandler<deal_II_dimension, deal_II_space_dimension>
             &particle_handler,
           const Mapping<deal_II_dimension, deal_II_space_dimension> &mapping,
-          const std::vector<std::vector<double>> &                   properties,
-          const ComponentMask &components);
+          const ComponentMask &                                      components,
+          const std::vector<std::vector<double>> &properties);
 
         template void
         quadrature_points<deal_II_dimension, deal_II_space_dimension>(