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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TurTLE
TurTLE
Commits
cd53dc3f
Commit
cd53dc3f
authored
4 years ago
by
Jose Agustin Arguedas Leiva
Browse files
Options
Downloads
Patches
Plain Diff
moved variables into protected to use in derived classes
parent
24993778
No related branches found
No related tags found
1 merge request
!30
Feature/write vector
Pipeline
#94725
passed
4 years ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
cpp/particles/p2p/p2p_ghost_collisions.hpp
+8
-7
8 additions, 7 deletions
cpp/particles/p2p/p2p_ghost_collisions.hpp
with
8 additions
and
7 deletions
cpp/particles/p2p/p2p_ghost_collisions.hpp
+
8
−
7
View file @
cd53dc3f
...
...
@@ -45,17 +45,12 @@ class p2p_ghost_collisions
const
double
pi
=
atan
(
1.0
)
*
4
;
const
double
pi2
=
atan
(
1.0
)
*
8
;
// depending on the particle shape, we will be deciding whether particles intersect in different ways
enum
particle_shape
{
CYLINDER
,
SPHERE
,
DISK
};
particle_shape
current_particle_shape
;
// description for cylinders:
double
cylinder_width
;
double
cylinder_length
;
// description for disks:
double
disk_width
;
bool
isActive
;
protected:
enum
particle_shape
{
CYLINDER
,
SPHERE
,
DISK
};
particle_shape
current_particle_shape
;
void
add_colliding_pair
(
partsize_t
idx_part1
,
partsize_t
idx_part2
)
{
// store colliding particle ids in order, to be able to identify pairs more easily
...
...
@@ -70,6 +65,12 @@ class p2p_ghost_collisions
this
->
collision_pairs_local
.
push_back
(
idx_part_small
);
this
->
collision_pairs_local
.
push_back
(
idx_part_big
);
}
// description for cylinders:
double
cylinder_width
;
double
cylinder_length
;
bool
isActive
;
bool
synchronisation
;
std
::
vector
<
partsize_t
>
collision_pairs_local
;
std
::
vector
<
partsize_t
>
collision_pairs_global
;
...
...
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