Indent + last batch of comments

chaos-polymtl · May 27, 2024 · ba3551f · ba3551f
1 parent 26ae163
commit ba3551f
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 37 deletions.
diff --git a/include/dem/input_parameter_inspection.h b/include/dem/input_parameter_inspection.h
@@ -37,9 +37,9 @@ using namespace std;
 
 template <int dim>
 void
-input_parameter_inspection(
-  const DEMSolverParameters<dim>              &dem_parameters,
-  const ConditionalOStream                    &pcout,
-  const std::vector<shared_ptr<Distribution>> &size_distribution_object_container);
+input_parameter_inspection(const DEMSolverParameters<dim> &dem_parameters,
+                           const ConditionalOStream       &pcout,
+                           const std::vector<shared_ptr<Distribution>>
+                             &size_distribution_object_container);
 
 #endif /* input_parameter_inspection_h */
diff --git a/include/dem/insertion_list.h b/include/dem/insertion_list.h
@@ -32,14 +32,14 @@ class InsertionList : public Insertion<dim>
 {
 public:
   /**
-   * @brief The InsertionList class inserts particles using a list specific positions.
-   * This allows the insertion of any number of particles at a well-controlled
-   * location which is especially useful from a testing perspective. The code
-   * ensures that the number of positions provided in the x,y (and possibly z)
-   * direction is coherent. If more particles than the number of positions in
-   * the list is requested, the class will continue inserting particles at the
-   * insertion frequency using the list of positions. There is no mechanism in
-   * place that prevents the overlap of these new particles with previous ones.
+   * @brief Insert particles using a list specific positions. This allows the
+   * insertion of any number of particles at a well-controlled location which is
+   * especially useful from a testing perspective. The code ensures that the
+   * number of positions provided in the x,y (and possibly z) direction is
+   * coherent. If more particles than the number of positions in the list is
+   * requested, the class will continue inserting particles at the insertion
+   * frequency using the list of positions. There is no mechanism in place that
+   * prevents the overlap of these new particles with previous ones.
    *
    * @param size_distribution_object_container Contains all distribution for each
    * particle type

diff --git a/source/dem/dem.cc b/source/dem/dem.cc
@@ -967,19 +967,17 @@ DEMSolver<dim>::set_insertion_type(const DEMSolverParameters<dim> &parameters)
   else if (parameters.insertion_info.insertion_method ==
            Parameters::Lagrangian::InsertionInfo::InsertionMethod::plane)
     {
-      insertion_object =
-        std::make_shared<InsertionPlane<dim>>(size_distribution_object_container,
-                                              triangulation,
-                                              parameters);
+      insertion_object = std::make_shared<InsertionPlane<dim>>(
+        size_distribution_object_container, triangulation, parameters);
     }
   else if (parameters.insertion_info.insertion_method ==
            Parameters::Lagrangian::InsertionInfo::InsertionMethod::volume)
     {
-      insertion_object =
-        std::make_shared<InsertionVolume<dim>>(size_distribution_object_container,
-                                               triangulation,
-                                               parameters,
-                                               maximum_particle_diameter);
+      insertion_object = std::make_shared<InsertionVolume<dim>>(
+        size_distribution_object_container,
+        triangulation,
+        parameters,
+        maximum_particle_diameter);
     }
   else
     {

diff --git a/source/dem/input_parameter_inspection.cc b/source/dem/input_parameter_inspection.cc
@@ -4,10 +4,10 @@ using namespace dealii;
 
 template <int dim>
 void
-input_parameter_inspection(
-  const DEMSolverParameters<dim>              &dem_parameters,
-  const ConditionalOStream                    &pcout,
-  const std::vector<shared_ptr<Distribution>> &size_distribution_object_container)
+input_parameter_inspection(const DEMSolverParameters<dim> &dem_parameters,
+                           const ConditionalOStream       &pcout,
+                           const std::vector<shared_ptr<Distribution>>
+                             &size_distribution_object_container)
 {
   // Getting the input parameters as local variable
   auto   parameters          = dem_parameters;
@@ -100,13 +100,13 @@ input_parameter_inspection(
 }
 
 template void
-input_parameter_inspection(
-  const DEMSolverParameters<2>                &dem_parameters,
-  const ConditionalOStream                    &pcout,
-  const std::vector<shared_ptr<Distribution>> &size_distribution_object_container);
+input_parameter_inspection(const DEMSolverParameters<2> &dem_parameters,
+                           const ConditionalOStream     &pcout,
+                           const std::vector<shared_ptr<Distribution>>
+                             &size_distribution_object_container);
 
 template void
-input_parameter_inspection(
-  const DEMSolverParameters<3>                &dem_parameters,
-  const ConditionalOStream                    &pcout,
-  const std::vector<shared_ptr<Distribution>> &size_distribution_object_container);
+input_parameter_inspection(const DEMSolverParameters<3> &dem_parameters,
+                           const ConditionalOStream     &pcout,
+                           const std::vector<shared_ptr<Distribution>>
+                             &size_distribution_object_container);
diff --git a/source/dem/insertion_file.cc b/source/dem/insertion_file.cc
@@ -11,7 +11,9 @@ InsertionFile<dim>::InsertionFile(
     &size_distribution_object_container,
   const parallel::distributed::Triangulation<dim> &triangulation,
   const DEMSolverParameters<dim>                  &dem_parameters)
-  : Insertion<dim>(size_distribution_object_container, triangulation, dem_parameters)
+  : Insertion<dim>(size_distribution_object_container,
+                   triangulation,
+                   dem_parameters)
   , remaining_particles_of_each_type(
       dem_parameters.lagrangian_physical_properties.number.at(0))
   , number_of_files(dem_parameters.insertion_info.list_of_input_files.size())

diff --git a/source/dem/insertion_list.cc b/source/dem/insertion_list.cc
@@ -18,7 +18,9 @@ InsertionList<dim>::InsertionList(
     &size_distribution_object_container,
   const parallel::distributed::Triangulation<dim> &triangulation,
   const DEMSolverParameters<dim>                  &dem_parameters)
-  : Insertion<dim>(size_distribution_object_container, triangulation, dem_parameters)
+  : Insertion<dim>(size_distribution_object_container,
+                   triangulation,
+                   dem_parameters)
   , remaining_particles_of_each_type(
       dem_parameters.lagrangian_physical_properties.number.at(0))
 {

diff --git a/source/dem/insertion_plane.cc b/source/dem/insertion_plane.cc
@@ -13,7 +13,9 @@ InsertionPlane<dim>::InsertionPlane(
     &size_distribution_object_container,
   const parallel::distributed::Triangulation<dim> &triangulation,
   const DEMSolverParameters<dim>                  &dem_parameters)
-  : Insertion<dim>(size_distribution_object_container, triangulation, dem_parameters)
+  : Insertion<dim>(size_distribution_object_container,
+                   triangulation,
+                   dem_parameters)
   , particles_of_each_type_remaining(
       dem_parameters.lagrangian_physical_properties.number.at(0))
 {

diff --git a/source/dem/insertion_volume.cc b/source/dem/insertion_volume.cc
@@ -14,7 +14,9 @@ InsertionVolume<dim>::InsertionVolume(
   const parallel::distributed::Triangulation<dim> &triangulation,
   const DEMSolverParameters<dim>                  &dem_parameters,
   const double                                     maximum_particle_diameter)
-  : Insertion<dim>(size_distribution_object_container, triangulation, dem_parameters)
+  : Insertion<dim>(size_distribution_object_container,
+                   triangulation,
+                   dem_parameters)
   , particles_of_each_type_remaining(
       dem_parameters.lagrangian_physical_properties.number.at(0))
 {