Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the Coulomb's criterion in linear, Hertz, and Hertz-Mindlin with limit force in DEM #1216

Merged
merged 13 commits into from
Jul 31, 2024
Merged

Fix the Coulomb's criterion in linear, Hertz, and Hertz-Mindlin with limit force in DEM #1216

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9f1ad69
Add absolute value to coulomb criterion
acdaigneault Jul 31, 2024
ce0ad1f
remove the abs from JRK
acdaigneault Jul 31, 2024
89068a9
Update tests
acdaigneault Jul 31, 2024
f9c8c38
Change to the over way
acdaigneault Jul 31, 2024
7550923
Revert "Update tests"
acdaigneault Jul 31, 2024
e55edbc
Fix the other tests
acdaigneault Jul 31, 2024
8d8aa03
Don't touch DMT
acdaigneault Jul 31, 2024
79551cb
Add changelog
acdaigneault Jul 31, 2024
163b0c3
Merge branch 'master' into dem_fix-coulomb
blaisb Jul 31, 2024
be8c863
Update include/dem/particle_particle_contact_force.h
blaisb Jul 31, 2024
db63345
Update include/dem/particle_particle_contact_force.h
blaisb Jul 31, 2024
a8d6561
Update include/dem/particle_particle_contact_force.h
blaisb Jul 31, 2024
4dd051c
Update include/dem/particle_particle_contact_force.h
blaisb Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions applications_tests/lethe-fluid-particles/spouted_bed_load_balancing.mpirun=2.output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ Particle statistics
| Contact list generation | 0.0000e+00 | 2.0000e+00 | 2.0000e+00 | 2.0000e+00 |
| Velocity magnitude | 1.1352e-06 | 9.9832e-02 | 1.6504e-02 | 5.1246e+02 |
| Angular velocity magnitude | 2.4264e-02 | 4.3111e+01 | 6.0452e+00 | 1.8770e+05 |
| Translational kinetic energy | 1.3316e-17 | 1.0298e-07 | 3.7774e-09 | 1.1729e-04 |
| Rotational kinetic energy | 7.6043e-15 | 2.4005e-08 | 7.3895e-10 | 2.2944e-05 |
| Translational kinetic energy | 1.3316e-17 | 1.0298e-07 | 3.7773e-09 | 1.1729e-04 |
| Rotational kinetic energy | 7.6044e-15 | 2.4005e-08 | 7.3895e-10 | 2.2944e-05 |

*******************************************************************************
Transient iteration: 2 Time: 0.002 Time step: 0.001 CFL: 1.39637
Expand Down Expand Up @@ -85,7 +85,7 @@ Particle statistics
--------------------
| Variable | Min | Max | Average | Total |
| Contact list generation | 0.0000e+00 | 2.0000e+00 | 2.0000e+00 | 4.0000e+00 |
| Velocity magnitude | 5.7051e-05 | 1.0407e-01 | 1.6740e-02 | 5.1976e+02 |
| Angular velocity magnitude | 1.2132e-02 | 4.7965e+01 | 5.7326e+00 | 1.7800e+05 |
| Translational kinetic energy | 3.3632e-14 | 1.1191e-07 | 3.7752e-09 | 1.1722e-04 |
| Rotational kinetic energy | 1.9010e-15 | 2.9715e-08 | 6.5871e-10 | 2.0453e-05 |
| Velocity magnitude | 5.7173e-05 | 1.0407e-01 | 1.6740e-02 | 5.1976e+02 |
| Angular velocity magnitude | 1.1583e-02 | 4.7964e+01 | 5.7326e+00 | 1.7800e+05 |
| Translational kinetic energy | 3.3776e-14 | 1.1191e-07 | 3.7752e-09 | 1.1722e-04 |
| Rotational kinetic energy | 1.7328e-15 | 2.9715e-08 | 6.5871e-10 | 2.0453e-05 |
68 changes: 34 additions & 34 deletions applications_tests/lethe-particles/box_grid_slide.output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,33 @@ This feature is useful in geometries with concave boundaries.
100 particles of type 0 were inserted, 0 particles of type 0 remaining
***********************************************************************
id, type, dp, x, y, z
0 0 0.00500 -0.0304 -0.0292 0.0124
0 0 0.00500 -0.0304 -0.0291 0.0124
1 0 0.00500 -0.0257 -0.0306 0.0124
2 0 0.00500 -0.0136 -0.0299 0.0124
3 0 0.00500 -0.0081 -0.0326 0.0124
4 0 0.00500 -0.0028 -0.0306 0.0124
5 0 0.00500 0.0062 -0.0348 0.0124
3 0 0.00500 -0.0082 -0.0323 0.0124
4 0 0.00500 -0.0028 -0.0307 0.0124
5 0 0.00500 0.0062 -0.0350 0.0124
6 0 0.00500 0.0126 -0.0290 0.0124
7 0 0.00500 0.0222 -0.0335 0.0124
8 0 0.00500 0.0311 -0.0328 0.0124
9 0 0.00500 -0.0306 -0.0242 0.0124
10 0 0.00500 -0.0215 -0.0251 0.0124
7 0 0.00500 0.0224 -0.0335 0.0124
8 0 0.00500 0.0313 -0.0330 0.0124
9 0 0.00500 -0.0305 -0.0242 0.0124
10 0 0.00500 -0.0214 -0.0251 0.0124
11 0 0.00500 -0.0156 -0.0252 0.0124
12 0 0.00500 -0.0115 -0.0216 0.0124
13 0 0.00500 0.0018 -0.0240 0.0124
12 0 0.00500 -0.0117 -0.0215 0.0124
13 0 0.00500 0.0020 -0.0241 0.0124
14 0 0.00500 0.0074 -0.0203 0.0124
15 0 0.00500 0.0123 -0.0235 0.0124
16 0 0.00500 0.0199 -0.0240 0.0124
15 0 0.00500 0.0122 -0.0235 0.0124
16 0 0.00500 0.0197 -0.0240 0.0124
17 0 0.00500 0.0316 -0.0202 0.0124
18 0 0.00500 -0.0325 -0.0157 0.0124
18 0 0.00500 -0.0326 -0.0157 0.0124
19 0 0.00500 -0.0216 -0.0157 0.0124
20 0 0.00500 -0.0152 -0.0133 0.0124
20 0 0.00500 -0.0151 -0.0134 0.0124
21 0 0.00500 -0.0080 -0.0157 0.0124
22 0 0.00500 -0.0003 -0.0158 0.0124
23 0 0.00500 0.0063 -0.0154 0.0124
24 0 0.00500 0.0131 -0.0152 0.0124
25 0 0.00500 0.0239 -0.0148 0.0124
26 0 0.00500 0.0293 -0.0152 0.0124
24 0 0.00500 0.0131 -0.0153 0.0124
25 0 0.00500 0.0240 -0.0148 0.0124
26 0 0.00500 0.0294 -0.0151 0.0124
27 0 0.00500 -0.0304 -0.0078 0.0124
28 0 0.00500 -0.0232 -0.0080 0.0124
29 0 0.00500 -0.0160 -0.0082 0.0124
Expand Down Expand Up @@ -93,22 +93,22 @@ id, type, dp, x, y, z
78 0 0.00500 0.0143 0.0295 0.0124
79 0 0.00500 0.0215 0.0293 0.0124
80 0 0.00500 0.0297 0.0296 0.0124
81 0 0.00500 -0.0311 -0.0360 0.0124
82 0 0.00500 -0.0202 -0.0299 0.0132
83 0 0.00500 -0.0181 -0.0359 0.0124
81 0 0.00500 -0.0311 -0.0361 0.0124
82 0 0.00500 -0.0203 -0.0300 0.0133
83 0 0.00500 -0.0182 -0.0359 0.0124
84 0 0.00500 -0.0129 -0.0361 0.0124
85 0 0.00500 0.0036 -0.0305 0.0124
86 0 0.00500 0.0074 -0.0269 0.0123
87 0 0.00500 0.0187 -0.0375 0.0124
88 0 0.00500 0.0181 -0.0307 0.0124
89 0 0.00500 0.0238 -0.0271 0.0124
90 0 0.00500 -0.0326 -0.0222 0.0175
91 0 0.00500 -0.0269 -0.0175 0.0124
92 0 0.00500 -0.0175 -0.0203 0.0126
93 0 0.00500 -0.0055 -0.0242 0.0124
94 0 0.00500 0.0010 -0.0218 0.0172
95 0 0.00500 0.0070 -0.0242 0.0165
96 0 0.00500 0.0189 -0.0189 0.0124
97 0 0.00500 0.0246 -0.0214 0.0124
98 0 0.00500 0.0312 -0.0278 0.0124
85 0 0.00500 0.0035 -0.0305 0.0124
86 0 0.00500 0.0075 -0.0269 0.0123
87 0 0.00500 0.0188 -0.0374 0.0124
88 0 0.00500 0.0180 -0.0307 0.0124
89 0 0.00500 0.0236 -0.0271 0.0124
90 0 0.00500 -0.0327 -0.0222 0.0174
91 0 0.00500 -0.0270 -0.0174 0.0124
92 0 0.00500 -0.0175 -0.0203 0.0127
93 0 0.00500 -0.0057 -0.0241 0.0124
94 0 0.00500 0.0010 -0.0219 0.0172
95 0 0.00500 0.0069 -0.0242 0.0165
96 0 0.00500 0.0189 -0.0188 0.0124
97 0 0.00500 0.0246 -0.0215 0.0124
98 0 0.00500 0.0313 -0.0277 0.0123
99 0 0.00500 -0.0278 -0.0120 0.0124
4 changes: 2 additions & 2 deletions applications_tests/lethe-particles/insert_list_3d_default_velocities.output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ This feature is useful in geometries with concave boundaries.
2 particles of type 0 were inserted, 0 particles of type 0 remaining
*********************************************************************
id, type, dp, x, y, z
0 0 0.00500 -0.0225 -0.0475 0.0194
1 0 0.00500 -0.0101 -0.0475 0.0339
0 0 0.00500 -0.0226 -0.0475 0.0194
1 0 0.00500 -0.0101 -0.0475 0.0340
Loading
Loading