Commit b50f99c7 authored by Jose Agustin Arguedas Leiva's avatar Jose Agustin Arguedas Leiva Committed by Cristian Lalescu
Browse files

moved variables into protected to use in derived classes

parent baa811c8
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment