From 105582614b345007dd3c889abb5190e2b9c17f44 Mon Sep 17 00:00:00 2001 From: blaisb Date: Tue, 2 Jun 2020 09:11:02 -0400 Subject: [PATCH] Change particle generation --- examples/step-68/step-68.cc | 48 +++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/examples/step-68/step-68.cc b/examples/step-68/step-68.cc index 5dfb7afffa..e7c2ef60c5 100644 --- a/examples/step-68/step-68.cc +++ b/examples/step-68/step-68.cc @@ -474,30 +474,38 @@ namespace Step68 const auto global_bounding_boxes = Utilities::MPI::all_gather(MPI_COMM_WORLD, my_bounding_box); + // We generate an empty vector of properties. We will fix the properties + // of the particles once they are generated. + std::vector> properties(particles_dof_handler.n_dofs(), + std::vector(dim + 1, + 0.)); + // We generate the particles at the position of the degree of // freedom of the dummy particle triangulation - // Particles::Generators::dof_support_points(particles_dof_handler, - // global_bounding_boxes, - // particle_handler); - std::map> support_points_map; - - DoFTools::map_dofs_to_support_points(mapping, - particles_dof_handler, - support_points_map); - - // Generate the vector of points from the map - // Memory is reserved for efficiency reasons - std::vector> support_points_vec; - support_points_vec.reserve(support_points_map.size()); - for (auto const &element : support_points_map) - support_points_vec.push_back(element.second); + Particles::Generators::dof_support_points(particles_dof_handler, + global_bounding_boxes, + particle_handler, + mapping, + properties); + + // std::map> support_points_map; + + // DoFTools::map_dofs_to_support_points(mapping, + // particles_dof_handler, + // support_points_map); + + // // Generate the vector of points from the map + // // Memory is reserved for efficiency reasons + // std::vector> support_points_vec; + // support_points_vec.reserve(support_points_map.size()); + // for (auto const &element : support_points_map) + // support_points_vec.push_back(element.second); + - std::vector> properties(particles_dof_handler.n_dofs(), - {0., 0., 0.}); - particle_handler.insert_global_particles(support_points_vec, - global_bounding_boxes, - properties); + // particle_handler.insert_global_particles(support_points_vec, + // global_bounding_boxes, + // properties); // Displaying the total number of generated particles in the domain pcout << "Number of particles inserted: " -- 2.39.5