Fixed insertion file restart and circle_restart. Circle restart gener…

…ator had two versions (one of them is now deleted)

applications_tests/lethe-particles/CMakeLists.txt

@@ -46,14 +46,14 @@ file(COPY moving_receptacle_files/restart_0.solid_object.00.dof DESTINATION "${C
 file(COPY moving_receptacle_files/restart_0.solid_object.00.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
 
 file(COPY restart_file_insertion_files/insertion_file_restart.checkpoint_controller DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
-file(COPY restart_file_insertion_files/insertion_file_restart_0.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
-file(COPY restart_file_insertion_files/insertion_file_restart_0.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
-file(COPY restart_file_insertion_files/insertion_file_restart_0.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
-file(COPY restart_file_insertion_files/insertion_file_restart_0.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
-file(COPY restart_file_insertion_files/insertion_file_restart_0.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
-file(COPY restart_file_insertion_files/insertion_file_restart_0.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
-file(COPY restart_file_insertion_files/insertion_file_restart_0.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
-file(COPY restart_file_insertion_files/insertion_file_restart_0.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
+file(COPY restart_file_insertion_files/insertion_file_restart_1.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
+file(COPY restart_file_insertion_files/insertion_file_restart_1.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
+file(COPY restart_file_insertion_files/insertion_file_restart_1.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
+file(COPY restart_file_insertion_files/insertion_file_restart_1.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
+file(COPY restart_file_insertion_files/insertion_file_restart_1.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
+file(COPY restart_file_insertion_files/insertion_file_restart_1.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
+file(COPY restart_file_insertion_files/insertion_file_restart_1.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
+file(COPY restart_file_insertion_files/insertion_file_restart_1.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
 file(COPY restart_file_insertion_files/particles_01.input DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
 
 deal_ii_pickup_tests()

applications_tests/lethe-particles/circle_restart_files/circle_restart.checkpoint_controller

@@ -1 +1 @@
-0 0 10 4 10
+0

applications_tests/lethe-particles/circle_restart_files/circle_restart_0.insertion_object

@@ -1 +1 @@
-10 0
+0 0

applications_tests/lethe-particles/circle_restart_files/circle_restart_0.triangulation.info

@@ -1,2 +1,2 @@
 version nproc n_attached_fixed_size_objs n_attached_variable_size_objs n_coarse_cells
-5 16 0 1 5
+5 1 0 1 5

applications_tests/lethe-particles/generators/circle_restart_generator.prm

@@ -14,17 +14,19 @@ subsection simulation control
   set time step        = 0.00001
   set time end         = 0.5
   set log frequency    = 1000000
-  set output frequency = 1000000
+  set output frequency = 0
 end
 
 #---------------------------------------------------
 # Restart
 #---------------------------------------------------
 
 subsection restart
+  set restart    = false
   set checkpoint = true
-  set frequency  = 50000
-  set filename   = circle_restart
+  set frequency  = 1000
+
+  set filename = circle_restart
 end
 
 #---------------------------------------------------
@@ -48,9 +50,11 @@ end
 #---------------------------------------------------
 
 subsection model parameters
-  set contact detection method               = constant
-  set contact detection frequency            = 10
-  set neighborhood threshold                 = 1.5
+  subsection contact detection
+    set contact detection method = constant
+    set frequency                = 10
+    set neighborhood threshold   = 1.5
+  end
   set particle particle contact force method = hertz_mindlin_limit_force
   set particle wall contact force method     = nonlinear
   set rolling resistance torque method       = no_resistance
@@ -67,27 +71,25 @@ subsection lagrangian physical properties
   subsection particle type 0
     set size distribution type            = uniform
     set diameter                          = 0.005
-    set number                            = 10
+    set number of particles               = 10
     set density particles                 = 800
     set young modulus particles           = 1000000
     set poisson ratio particles           = 0.3
     set restitution coefficient particles = 0.2
     set friction coefficient particles    = 0.1
-    set rolling friction particles        = 0.05
   end
   set young modulus wall           = 1000000
   set poisson ratio wall           = 0.3
   set restitution coefficient wall = 0.3
   set friction coefficient wall    = 0.1
-  set rolling friction wall        = 0.05
 end
 
 #---------------------------------------------------
 # Insertion Info
 #---------------------------------------------------
 
 subsection insertion info
-  set insertion method                               = non_uniform
+  set insertion method                               = volume
   set inserted number of particles at each time step = 20
   set insertion frequency                            = 51000
   set insertion box points coordinates               = -0.02, -0.07 : 0.05, 0.0
@@ -105,5 +107,5 @@ subsection mesh
   set grid type                           = hyper_ball
   set grid arguments                      = 0.0, 0.0 : 0.1 : false
   set initial refinement                  = 3
-  set expand particle-wall contact search = false
+  set expand particle-wall contact search = true
 end

applications_tests/lethe-particles/restart_file_insertion.prm

@@ -31,7 +31,7 @@ end
 #---------------------------------------------------
 
 subsection restart
-  set checkpoint = false      # = true to generate the restart files.
+  set checkpoint = false     # = true to generate the restart files.
   set frequency  = 10000
   set restart    = true       # = false to generate the restart files.
   set filename   = insertion_file_restart