Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TurTLE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TurTLE
TurTLE
Commits
05c25b36
Commit
05c25b36
authored
4 years ago
by
Jose Agustin Arguedas Leiva
Committed by
Cristian Lalescu
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fixed rod p2p typo
parent
91c0f555
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
cpp/particles/p2p/p2p_ghost_collisions.hpp
+3
-3
3 additions, 3 deletions
cpp/particles/p2p/p2p_ghost_collisions.hpp
with
3 additions
and
3 deletions
cpp/particles/p2p/p2p_ghost_collisions.hpp
+
3
−
3
View file @
05c25b36
...
@@ -218,7 +218,7 @@ public:
...
@@ -218,7 +218,7 @@ public:
real_number
/*rhs_part2*/
[],
real_number
/*rhs_part2*/
[],
const
real_number
dist_pow2
,
const
real_number
dist_pow2
,
const
real_number
/*cutoff*/
,
const
real_number
/*cutoff*/
,
const
real_number
xseparation
,
const
real_number
xseparation
,
/* This separation is x1-x2 */
const
real_number
yseparation
,
const
real_number
yseparation
,
const
real_number
zseparation
){
const
real_number
zseparation
){
switch
(
this
->
current_particle_shape
)
switch
(
this
->
current_particle_shape
)
...
@@ -250,8 +250,8 @@ public:
...
@@ -250,8 +250,8 @@ public:
xq
=
x
*
pos_part2
[
IDXC_X
+
3
]
+
y
*
pos_part2
[
IDXC_Y
+
3
]
+
z
*
pos_part2
[
IDXC_Z
+
3
];
xq
=
x
*
pos_part2
[
IDXC_X
+
3
]
+
y
*
pos_part2
[
IDXC_Y
+
3
]
+
z
*
pos_part2
[
IDXC_Z
+
3
];
/* t and s parametrize the two rods. Find min distance: */
/* t and s parametrize the two rods. Find min distance: */
assert
(
this
->
cylinder_length
>
0
);
assert
(
this
->
cylinder_length
>
0
);
t
=
2.0
/
(
this
->
cylinder_length
*
(
pq
*
pq
-
1.0
))
*
(
-
xp
+
pq
*
xq
);
t
=
2.0
/
(
this
->
cylinder_length
*
(
pq
*
pq
-
1.0
))
*
(
xp
-
pq
*
xq
);
s
=
2.0
/
(
this
->
cylinder_length
*
(
pq
*
pq
-
1.0
))
*
(
-
pq
*
xp
+
xq
);
s
=
2.0
/
(
this
->
cylinder_length
*
(
pq
*
pq
-
1.0
))
*
(
pq
*
xp
-
xq
);
/* Test if -1<s<1 and -1<t<1 */
/* Test if -1<s<1 and -1<t<1 */
if
(
abs
(
t
)
<=
1.0
and
abs
(
s
)
<=
1.0
)
if
(
abs
(
t
)
<=
1.0
and
abs
(
s
)
<=
1.0
)
{
{
...
...
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