Skip to content

Commit

Permalink
Regenerate clean application test outputs in DEM and CFD-DEM (#1207)
Browse files Browse the repository at this point in the history 
Description
The application test outputs had some extra spaces or some missing spaces, making it appears in diff of files when the output is updated and put them back or remove them. It makes it hard to focus on the real changes of the test.
Also, some strings in CFD-DEM did have spaces for no reason.

Solution
Remove the explicit spaces in CFD-DEM and regenerate all the tests in DEM and CFD-DEM from the real output files of tests (no copy-paste).

Testing
All tests are the same.
I added particle statistic output to spouted_bed_load_balancing test for more robust testing in CFD-DEM.
  • Loading branch information
@acdaigneault
acdaigneault authored Jul 26, 2024
1 parent 0e00aac commit cda1644
Show file tree
Hide file tree
Showing 37 changed files with 927 additions and 906 deletions.
62 changes: 31 additions & 31 deletions applications_tests/lethe-fluid-particles/adaptive_sparse_contacts.mpirun=1.output
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Running on 1 MPI rank(s)...
DEM time-step is 2.61468% of Rayleigh time step
Reading DEM checkpoint
Finished reading DEM checkpoint
350 particles are in the simulation
Reading DEM checkpoint
Finished reading DEM checkpoint
350 particles are in the simulation
Number of active cells: 8
Number of degrees of freedom: 144
Volume of triangulation: 0.00125
---------------------------------------------------------------
Initializing DEM parameters
Initializing DEM parameters
Warning: expansion of particle-wall contact list is disabled.
This feature is useful in geometries with concave boundaries.
Finished initializing DEM parameters
DEM time-step is 2e-05 s
Finished initializing DEM parameters
DEM time-step is 2e-05 s
--------------
Void Fraction
--------------
Expand Down Expand Up @@ -49,82 +49,82 @@ print_from_processor_0
8
[deal.II intermediate Patch<3,3>]
7
0 0 0 0.05 0 0 0 0.0625 0 0.05 0.0625 0 0 0 0.05 0.05 0 0.05 0 0.0625 0.05 0.05 0.0625 0.05
4294967295 4294967295 4294967295 1 4294967295 4294967295
0 0 0 0.05 0 0 0 0.0625 0 0.05 0.0625 0 0 0 0.05 0.05 0 0.05 0 0.0625 0.05 0.05 0.0625 0.05
4294967295 4294967295 4294967295 1 4294967295 4294967295
0 1
0
1 8
4 4 4 4 4 4 4 4
4 4 4 4 4 4 4 4


[deal.II intermediate Patch<3,3>]
7
0 0.0625 0 0.05 0.0625 0 0 0.125 0 0.05 0.125 0 0 0.0625 0.05 0.05 0.0625 0.05 0 0.125 0.05 0.05 0.125 0.05
4294967295 4294967295 0 2 4294967295 4294967295
0 0.0625 0 0.05 0.0625 0 0 0.125 0 0.05 0.125 0 0 0.0625 0.05 0.05 0.0625 0.05 0 0.125 0.05 0.05 0.125 0.05
4294967295 4294967295 0 2 4294967295 4294967295
1 1
0
1 8
4 4 4 4 4 4 4 4
4 4 4 4 4 4 4 4


[deal.II intermediate Patch<3,3>]
7
0 0.125 0 0.05 0.125 0 0 0.1875 0 0.05 0.1875 0 0 0.125 0.05 0.05 0.125 0.05 0 0.1875 0.05 0.05 0.1875 0.05
4294967295 4294967295 1 3 4294967295 4294967295
0 0.125 0 0.05 0.125 0 0 0.1875 0 0.05 0.1875 0 0 0.125 0.05 0.05 0.125 0.05 0 0.1875 0.05 0.05 0.1875 0.05
4294967295 4294967295 1 3 4294967295 4294967295
2 1
0
1 8
3 3 3 3 3 3 3 3
3 3 3 3 3 3 3 3


[deal.II intermediate Patch<3,3>]
7
0 0.1875 0 0.05 0.1875 0 0 0.25 0 0.05 0.25 0 0 0.1875 0.05 0.05 0.1875 0.05 0 0.25 0.05 0.05 0.25 0.05
4294967295 4294967295 2 4 4294967295 4294967295
0 0.1875 0 0.05 0.1875 0 0 0.25 0 0.05 0.25 0 0 0.1875 0.05 0.05 0.1875 0.05 0 0.25 0.05 0.05 0.25 0.05
4294967295 4294967295 2 4 4294967295 4294967295
3 1
0
1 8
2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2


[deal.II intermediate Patch<3,3>]
7
0 0.25 0 0.05 0.25 0 0 0.3125 0 0.05 0.3125 0 0 0.25 0.05 0.05 0.25 0.05 0 0.3125 0.05 0.05 0.3125 0.05
4294967295 4294967295 3 5 4294967295 4294967295
0 0.25 0 0.05 0.25 0 0 0.3125 0 0.05 0.3125 0 0 0.25 0.05 0.05 0.25 0.05 0 0.3125 0.05 0.05 0.3125 0.05
4294967295 4294967295 3 5 4294967295 4294967295
4 1
0
1 8
3 3 3 3 3 3 3 3
3 3 3 3 3 3 3 3


[deal.II intermediate Patch<3,3>]
7
0 0.3125 0 0.05 0.3125 0 0 0.375 0 0.05 0.375 0 0 0.3125 0.05 0.05 0.3125 0.05 0 0.375 0.05 0.05 0.375 0.05
4294967295 4294967295 4 6 4294967295 4294967295
0 0.3125 0 0.05 0.3125 0 0 0.375 0 0.05 0.375 0 0 0.3125 0.05 0.05 0.3125 0.05 0 0.375 0.05 0.05 0.375 0.05
4294967295 4294967295 4 6 4294967295 4294967295
5 1
0
1 8
4 4 4 4 4 4 4 4
4 4 4 4 4 4 4 4


[deal.II intermediate Patch<3,3>]
7
0 0.375 0 0.05 0.375 0 0 0.4375 0 0.05 0.4375 0 0 0.375 0.05 0.05 0.375 0.05 0 0.4375 0.05 0.05 0.4375 0.05
4294967295 4294967295 5 7 4294967295 4294967295
0 0.375 0 0.05 0.375 0 0 0.4375 0 0.05 0.4375 0 0 0.375 0.05 0.05 0.375 0.05 0 0.4375 0.05 0.05 0.4375 0.05
4294967295 4294967295 5 7 4294967295 4294967295
6 1
0
1 8
4 4 4 4 4 4 4 4
4 4 4 4 4 4 4 4


[deal.II intermediate Patch<3,3>]
7
0 0.4375 0 0.05 0.4375 0 0 0.5 0 0.05 0.5 0 0 0.4375 0.05 0.05 0.4375 0.05 0 0.5 0.05 0.05 0.5 0.05
4294967295 4294967295 6 4294967295 4294967295 4294967295
0 0.4375 0 0.05 0.4375 0 0 0.5 0 0.05 0.5 0 0 0.4375 0.05 0.05 0.4375 0.05 0 0.5 0.05 0.05 0.5 0.05
4294967295 4294967295 6 4294967295 4294967295 4294967295
7 1
0
1 8
4 4 4 4 4 4 4 4
4 4 4 4 4 4 4 4


0
Expand All @@ -134,7 +134,7 @@ DEM
----
DEM contact search at dem step 1
DEM contact search at dem step 49
Finished 50 DEM iterations
Finished 50 DEM iterations
---------------------------------------------------------------
Global continuity equation error: -2.28117e-09 s^-1
Max local continuity error: 6.96484e-07 s^-1
12 changes: 6 additions & 6 deletions applications_tests/lethe-fluid-particles/conserve_phase_volumes.mpirun=1.output
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Running on 1 MPI rank(s)...
DEM time-step is 2.433653979% of Rayleigh time step
Reading DEM checkpoint
Finished reading DEM checkpoint
10000 particles are in the simulation
Reading DEM checkpoint
Finished reading DEM checkpoint
10000 particles are in the simulation
Number of active cells: 4500
Number of degrees of freedom: 21504
Volume of triangulation: 0.001
---------------------------------------------------------------
Initializing DEM parameters
Initializing DEM parameters
Warning: expansion of particle-wall contact list is disabled.
This feature is useful in geometries with concave boundaries.
Finished initializing DEM parameters
DEM time-step is 1e-05 s
Finished initializing DEM parameters
DEM time-step is 1e-05 s
--------------
Void Fraction
--------------
Expand Down
16 changes: 8 additions & 8 deletions applications_tests/lethe-fluid-particles/dynamic_contact_search.mpirun=1.output
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Running on 1 MPI rank(s)...
DEM time-step is 18.27064813% of Rayleigh time step
Reading DEM checkpoint
Finished reading DEM checkpoint
1 particles are in the simulation
Reading DEM checkpoint
Finished reading DEM checkpoint
1 particles are in the simulation
Number of active cells: 200
Number of degrees of freedom: 1100
Volume of triangulation: 0.001414213562
---------------------------------------------------------------
Initializing DEM parameters
Initializing DEM parameters
Warning: expansion of particle-wall contact list is disabled.
This feature is useful in geometries with concave boundaries.
Finished initializing DEM parameters
DEM time-step is 5e-05 s
Finished initializing DEM parameters
DEM time-step is 5e-05 s
--------------
Void Fraction
--------------
Expand All @@ -26,7 +26,7 @@ Void Fraction
Volume-Averaged Fluid Dynamics
-------------------------------
Particle Summary
id, x, y, z, v_x, v_y, v_z
id, x, y, z, v_x, v_y, v_z
0 -0.0175 -0.0005 -0.0005 0 0 0
----
DEM
Expand All @@ -39,7 +39,7 @@ Global continuity equation error: 0 s^-1
Max local continuity error: 0 s^-1

*******************************************************************************
Transient iteration: 2 Time: 0.01 Time step: 0.005 CFL: 0
Transient iteration: 2 Time: 0.01 Time step: 0.005 CFL: 0
*******************************************************************************
--------------
Void Fraction
Expand Down
12 changes: 6 additions & 6 deletions applications_tests/lethe-fluid-particles/liquid_fluidized_bed.mpirun=1.output
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Running on 1 MPI rank(s)...
DEM time-step is 2.433653979% of Rayleigh time step
Reading DEM checkpoint
Finished reading DEM checkpoint
10000 particles are in the simulation
Reading DEM checkpoint
Finished reading DEM checkpoint
10000 particles are in the simulation
Number of active cells: 4500
Number of degrees of freedom: 21504
Volume of triangulation: 0.001
---------------------------------------------------------------
Initializing DEM parameters
Initializing DEM parameters
Warning: expansion of particle-wall contact list is disabled.
This feature is useful in geometries with concave boundaries.
Finished initializing DEM parameters
DEM time-step is 1e-05 s
Finished initializing DEM parameters
DEM time-step is 1e-05 s
--------------
Void Fraction
--------------
Expand Down
16 changes: 8 additions & 8 deletions applications_tests/lethe-fluid-particles/particle_sedimentation.mpirun=1.output
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Running on 1 MPI rank(s)...
DEM time-step is 18.27064813% of Rayleigh time step
Reading DEM checkpoint
Finished reading DEM checkpoint
1 particles are in the simulation
Reading DEM checkpoint
Finished reading DEM checkpoint
1 particles are in the simulation
Number of active cells: 200
Number of degrees of freedom: 1100
Volume of triangulation: 0.001414213562
---------------------------------------------------------------
Initializing DEM parameters
Initializing DEM parameters
Warning: expansion of particle-wall contact list is disabled.
This feature is useful in geometries with concave boundaries.
Finished initializing DEM parameters
DEM time-step is 5e-05 s
Finished initializing DEM parameters
DEM time-step is 5e-05 s
--------------
Void Fraction
--------------
Expand All @@ -26,7 +26,7 @@ Void Fraction
Volume-Averaged Fluid Dynamics
-------------------------------
Particle Summary
id, x, y, z, v_x, v_y, v_z
id, x, y, z, v_x, v_y, v_z
0 -0.0175 -0.0005 -0.0005 0 0 0
----
DEM
Expand All @@ -48,7 +48,7 @@ Global continuity equation error: 0 s^-1
Max local continuity error: 0 s^-1

*******************************************************************************
Transient iteration: 2 Time: 0.01 Time step: 0.005 CFL: 0
Transient iteration: 2 Time: 0.01 Time step: 0.005 CFL: 0
*******************************************************************************
--------------
Void Fraction
Expand Down
14 changes: 7 additions & 7 deletions applications_tests/lethe-fluid-particles/periodic_particles_qcm.mpirun=1.output
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Running on 1 MPI rank(s)...
DEM time-step is 5.13612% of Rayleigh time step
Reading DEM checkpoint
Finished reading DEM checkpoint
2 particles are in the simulation
Reading DEM checkpoint
Finished reading DEM checkpoint
2 particles are in the simulation
Number of active cells: 48
Number of degrees of freedom: 468
Volume of triangulation: 0.000384
---------------------------------------------------------------
Initializing DEM parameters
Initializing DEM parameters
Warning: expansion of particle-wall contact list is disabled.
This feature is useful in geometries with concave boundaries.
Finished initializing DEM parameters
DEM time-step is 1e-05 s
Finished initializing DEM parameters
DEM time-step is 1e-05 s
--------------
Void Fraction
--------------
Expand All @@ -32,7 +32,7 @@ Void Fraction
Volume-Averaged Fluid Dynamics
-------------------------------
Particle Summary
id, x, y, z, v_x, v_y, v_z
id, x, y, z, v_x, v_y, v_z
0 0.1199 0.00499572 0.019 0 2.24509e-14 0
1 0.2399 0.00499572 0.019 0 2.24509e-14 0
----
Expand Down
12 changes: 6 additions & 6 deletions ...ications_tests/lethe-fluid-particles/periodic_particles_qcm_opposite_flow.mpirun=2.output
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Running on 2 MPI rank(s)...
DEM time-step is 5.13612% of Rayleigh time step
Reading DEM checkpoint
Finished reading DEM checkpoint
2 particles are in the simulation
Reading DEM checkpoint
Finished reading DEM checkpoint
2 particles are in the simulation
Number of active cells: 48
Number of degrees of freedom: 468
Volume of triangulation: 0.000384
---------------------------------------------------------------
Initializing DEM parameters
Initializing DEM parameters
Warning: expansion of particle-wall contact list is disabled.
This feature is useful in geometries with concave boundaries.
Finished initializing DEM parameters
DEM time-step is 1e-05 s
Finished initializing DEM parameters
DEM time-step is 1e-05 s
--------------
Void Fraction
--------------
Expand Down
6 changes: 3 additions & 3 deletions applications_tests/lethe-fluid-particles/restart-gas-solid-fluidized-bed.mpirun=2.output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ DEM time-step is 3.65413% of Rayleigh time step
Number of active cells: 2560
Number of degrees of freedom: 16100
Volume of triangulation: 0.00108
Initializing DEM parameters
Initializing DEM parameters
Warning: expansion of particle-wall contact list is disabled.
This feature is useful in geometries with concave boundaries.
Finished initializing DEM parameters
DEM time-step is 5e-06 s
Finished initializing DEM parameters
DEM time-step is 5e-06 s

********************************************************************************
Transient iteration: 6 Time: 0.00125 Time step: 0.00025 CFL: 0.0354915
Expand Down
6 changes: 3 additions & 3 deletions applications_tests/lethe-fluid-particles/restart_particle_sedimentation.mpirun=1.output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ DEM time-step is 18.27064813% of Rayleigh time step
Number of active cells: 200
Number of degrees of freedom: 1100
Volume of triangulation: 0.001414213562
Initializing DEM parameters
Initializing DEM parameters
Warning: expansion of particle-wall contact list is disabled.
This feature is useful in geometries with concave boundaries.
Finished initializing DEM parameters
DEM time-step is 5e-05 s
Finished initializing DEM parameters
DEM time-step is 5e-05 s

**********************************************************************************
Transient iteration: 51 Time: 0.255 Time step: 0.005 CFL: 0.000113657
Expand Down
Loading

0 comments on commit cda1644

Please sign in to comment.