Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fluidparticles
MigFlow
Commits
46842f09
Commit
46842f09
authored
Mar 18, 2019
by
Nathan Coppin
Browse files
Sens de vt pour les segments est correct
parent
a350b74d
Pipeline
#5179
passed with stage
in 27 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
scontact/scontact.c
View file @
46842f09
...
...
@@ -420,7 +420,7 @@ static int contactParticleDiskSolve(Contact *c, ParticleProblem *p, double dt, d
p
->
velocity
[
c
->
o1
*
DIMENSION
]
*
t
[
0
]
+
p
->
velocity
[
c
->
o1
*
DIMENSION
+
1
]
*
t
[
1
]
+
p
->
omega
[
c
->
o1
]
*
p
->
particles
[
c
->
o1
].
r
+
p
->
disks
[
c
->
o0
].
vt
*
((
t
[
0
]
!=
0
)
?
-
(
1
-
2
*
signbit
(
t
[
0
]))
:
(
1
-
2
*
signbit
(
t
[
0
]))
)
;
p
->
disks
[
c
->
o0
].
vt
;
const
double
mu
=
particleProblemGetMu
(
p
,
p
->
particleMaterial
[
c
->
o1
],
p
->
diskMaterial
[
c
->
o0
]);
double
ct
=
0
;
if
(
vt
>
(
3
.
/
1
.)
*
mu
*
dp
){
...
...
@@ -461,12 +461,14 @@ static int contactParticleSegmentSolve(Contact *c, ParticleProblem *p, double dt
double
t
[
2
];
t
[
0
]
=
-
c
->
n
[
1
];
t
[
1
]
=
c
->
n
[
0
];
Segment
seg
=
p
->
segments
[
c
->
o0
];
double
sign
=
(
seg
.
p
[
0
][
0
]
-
seg
.
p
[
1
][
0
])
*
t
[
0
]
+
(
seg
.
p
[
0
][
1
]
-
seg
.
p
[
1
][
1
])
*
t
[
1
];
double
vt
=
c
->
ct
+
c
->
ct
*
p
->
particles
[
c
->
o1
].
r
*
c
->
In1
+
p
->
velocity
[
c
->
o1
*
DIMENSION
]
*
t
[
0
]
+
p
->
velocity
[
c
->
o1
*
DIMENSION
+
1
]
*
t
[
1
]
+
p
->
omega
[
c
->
o1
]
*
p
->
particles
[
c
->
o1
].
r
+
p
->
segments
[
c
->
o0
].
vt
*
((
t
[
0
]
!=
0
)
?
-
(
1
-
2
*
signbit
(
t
[
0
]))
:
(
1
-
2
*
signbit
(
t
[
0
]))
);
seg
.
vt
*
(
sign
>
0
?
1
:
-
1
);
const
double
mu
=
particleProblemGetMu
(
p
,
p
->
particleMaterial
[
c
->
o1
],
p
->
segmentMaterial
[
c
->
o0
]);
double
ct
=
0
;
if
(
vt
>
(
3
.
/
1
.)
*
mu
*
dp
){
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment