Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pairs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
software
pairs
Commits
016f04c3
Commit
016f04c3
authored
1 year ago
by
Rafael Ravedutti
Browse files
Options
Downloads
Patches
Plain Diff
Update DEM kernel
Signed-off-by:
Rafael Ravedutti
<
rafaelravedutti@gmail.com
>
parent
46f6d879
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
examples/dem.py
+5
-7
5 additions, 7 deletions
examples/dem.py
with
5 additions
and
7 deletions
examples/dem.py
+
5
−
7
View file @
016f04c3
...
...
@@ -59,12 +59,10 @@ def linear_spring_dashpot(i, j):
cond2
=
sticking
==
1
and
fTLS_len
<
f_friction_abs_dynamic
f_friction_abs
=
select
(
cond1
,
f_friction_abs_static
,
f_friction_abs_dynamic
)
n_sticking
=
select
(
cond1
or
cond2
or
fTLS_len
<
f_friction_abs_dynamic
,
1
,
0
)
if
not
cond1
and
not
cond2
and
stiffness_tan
>
0.0
:
tangential_spring_displacement
[
i
,
j
]
=
(
f_friction_abs
*
t
-
damping_tan
*
rel_vel_t
)
/
stiffness_tan
else
:
tangential_spring_displacement
[
i
,
j
]
=
new_tan_spring_disp
tangential_spring_displacement
[
i
,
j
]
=
\
select
(
not
cond1
and
not
cond2
and
stiffness_tan
>
0.0
,
(
f_friction_abs
*
t
-
damping_tan
*
rel_vel_t
)
/
stiffness_tan
,
new_tan_spring_disp
)
impact_velocity_magnitude
[
i
,
j
]
=
impact_magnitude
is_sticking
[
i
,
j
]
=
n_sticking
...
...
@@ -181,7 +179,7 @@ psim.setup(update_mass_and_inertia, {'densityParticle_SI': densityParticle_SI,
#psim.compute_half()
psim
.
build_cell_lists
(
linkedCellWidth
)
psim
.
vtk_output
(
f
"
output/dem_
{
target
}
"
,
frequency
=
visSpacing
)
#
psim.vtk_output(f"output/dem_{target}", frequency=visSpacing)
psim
.
compute
(
gravity
,
symbols
=
{
'
densityParticle_SI
'
:
densityParticle_SI
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment