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 11cb6f56bcb033ad8fa4a6c05c2a94c905864226..bd3887a7c299e3d553d6be6b42ae25fd6c04e39a 100644 (file)
--- 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 da677b75529069ce35ed31fb0788abb00612f39a..331b2aa38e7c7ab341bd176057837e69f9c53d9d 100644 (file)
--- 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 51d92313c5068a50db1211e382991ec13875d6dc..7ea80d0e1a9f9d04a167c1bf5028a60c4dc5c3b0 100644 (file)
--- 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>(