Apply suggestions from code review

Code suggestions

Co-authored-by: Olivier Guévremont <guevremont.o@gmail.com>
Co-authored-by: Audrey Collard-Daigneault <71884806+acdaigneault@users.noreply.github.com>

doc/source/examples/dem/granular-dam-break/granular-dam-break.rst

@@ -144,7 +144,7 @@ The sluice gate which prevents the particle from floating is made of a 3D surfac
           set Function expression = 0 ; if(t>0.5,if(t<0.7,1,0),0) ; 0
         end
         subsection angular velocity
-          set Function expression = 0 ; 0  ; 0
+          set Function expression = 0 ; 0 ; 0
         end
       end
     end

doc/source/parameters/dem/dem.rst

@@ -7,7 +7,7 @@ Insertion information including the dimensions of the insertion box, insertion f
 The``mesh`` section defines the simulation triangulation and refinements. 
 In the ``DEM boundary conditions`` section, boundaries can be defined as outlets or they can get periodicity, rotation or translation.  
 In the ``floating walls`` section, hyperplanes can be added to the simulation domain. 
-In the ``solid objects`` section, surface meshes can defined and their motion can be controled.
+In the ``solid objects`` section, surface meshes can defined and their motion can be controlled.
 
 .. toctree::
    :maxdepth: 1

doc/source/parameters/dem/solid_objects.rst

@@ -3,7 +3,7 @@ Solid Objects
 =============================
 
 Solid objects are finite auxiliary objects that can be stationary or in motion. Rotating impellers, sliding surfaces, and finite stoppers are examples of solid objects. The main differences between them and floating walls are:
-1. floating wall is a plan, while a solid object can be either a volume or a surface
+1. floating wall is a plane, while a solid object can be either a volume or a surface
 2. floating wall is infinite, while solid object is finite
 3. floating wall is stationary while solid object may be stationary or moving.
 
@@ -45,7 +45,7 @@ This subsection explains the solid objects information. First of all, the ``numb
 
 * The ``number of solids`` parameter defines the total number of solid surfaces used during the simulation.
 
-* For each solid object, we need a separate subsections (for instance 	``subsection solid object 0``) in which the information of the solid surface 0 (``type``, ``file name``, ``initial refinement``, ``initial translation``, ``initial rotation axis``, ``initial rotation angle``  ) is defined. Each component of the ``initial translation`` and of the ``initial rotation axis`` parameters represent the ``x``, ``y`` and ``z`` axis. The rotation is apply before the translation.
+* For each solid object, we need a separate subsections (for instance 	``subsection solid object 0``) in which the information of the solid surface 0 (``type``, ``file name``, ``initial refinement``, ``initial translation``, ``initial rotation axis``, ``initial rotation angle``) is defined. Each component of the ``initial translation`` and of the ``initial rotation axis`` parameters represent the ``x``, ``y`` and ``z`` axes. The rotation is applied before the translation.
 
 * In the subsection ``translational velocity``, we define the translational velocity function of the solid object.
 

examples/dem/3d-dam-break/granular-dam-break-H-40cm.prm

@@ -114,7 +114,7 @@ subsection solid objects
         set Function expression = 0 ; if(t>0.5,if(t<1.5,2,0),0) ; 0
       end
       subsection angular velocity
-        set Function expression = 0 ; 0  ; 0
+        set Function expression = 0 ; 0 ; 0
       end
     end
   end

examples/dem/3d-dam-break/granular-dam-break.prm

@@ -113,7 +113,7 @@ subsection solid objects
         set Function expression = 0 ; if(t>0.5,if(t<0.7,1,0),0) ; 0
       end
       subsection angular velocity
-        set Function expression = 0 ; 0  ; 0
+        set Function expression = 0 ; 0 ; 0
       end
     end
   end

include/core/solid_objects_parameters.h

@@ -450,7 +450,7 @@ namespace Parameters
         prm.declare_entry("number of solids",
                           "0",
                           Patterns::Integer(),
-                          "Number of solid object");
+                          "Number of solid surfaces");
 
         for (unsigned int i_solid = 0; i_solid < max_number_of_solids;
              ++i_solid)
@@ -466,7 +466,7 @@ namespace Parameters
         prm.declare_entry("number of solids",
                           "0",
                           Patterns::Integer(),
-                          "Number of solid object");
+                          "Number of solid volumes");
 
         for (unsigned int i_solid = 0; i_solid < max_number_of_solids;
              ++i_solid)

include/dem/data_containers.h

@@ -201,17 +201,13 @@ namespace DEM
       std::vector<typename Triangulation<dim>::active_cell_iterator>>
       cells_neighbor_list;
 
-    // [[(cell iterator, cell iterator)]]
-    // First cell iterator is for the background triangulation, second cell
-    // iterator is for the solid surfaces.
+    // [[(background cell iterator, solid surface cell iterator)]]
     typedef std::vector<std::vector<
       std::pair<typename Triangulation<dim>::active_cell_iterator,
                 typename Triangulation<dim - 1, dim>::active_cell_iterator>>>
       solid_surfaces_mesh_information;
 
-    // [[(cell iterator, cell iterator)]]
-    // First cell iterator is for the background triangulation, second cell
-    // iterator is for the solid volumes.
+    // [[(background cell iterator, solid volume cell iterator)]]
     typedef std::vector<std::vector<
       std::pair<typename Triangulation<dim>::active_cell_iterator,
                 typename Triangulation<dim, dim>::active_cell_iterator>>>

source/core/solid_base.cc

@@ -155,7 +155,7 @@ SolidBase<dim, spacedim>::setup_triangulation(const bool restart)
       else
         { // Grid creation
           GridIn<dim, spacedim> grid_in;
-          // Attach triangulation to the griread_d
+          // Attach triangulation to the grid
           grid_in.attach_triangulation(*solid_tria);
           // Read input gmsh file
           std::ifstream input_file(param->solid_mesh.file_name);

tests/dem/volume_solid_object_displacement.cc

@@ -3,7 +3,6 @@
  */
 
 // Deal.II
-
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_tools.h>