Skip to content
Snippets Groups Projects

Feature/write vector

Closed Jose Agustin Arguedas Leiva requested to merge feature/write_vector into develop
1 file
+ 8
7
Compare changes
  • Side-by-side
  • Inline
@@ -45,17 +45,12 @@ class p2p_ghost_collisions
@@ -45,17 +45,12 @@ class p2p_ghost_collisions
const double pi = atan(1.0)*4;
const double pi = atan(1.0)*4;
const double pi2 = atan(1.0)*8;
const double pi2 = atan(1.0)*8;
// depending on the particle shape, we will be deciding whether particles intersect in different ways
// 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:
// description for disks:
double disk_width;
double disk_width;
bool isActive;
protected:
protected:
 
enum particle_shape {CYLINDER, SPHERE, DISK};
 
particle_shape current_particle_shape;
void add_colliding_pair(partsize_t idx_part1, partsize_t idx_part2)
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
// store colliding particle ids in order, to be able to identify pairs more easily
@@ -70,6 +65,12 @@ class p2p_ghost_collisions
@@ -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_small);
this->collision_pairs_local.push_back(idx_part_big);
this->collision_pairs_local.push_back(idx_part_big);
}
}
 
// description for cylinders:
 
double cylinder_width;
 
double cylinder_length;
 
 
bool isActive;
 
bool synchronisation;
bool synchronisation;
std::vector <partsize_t> collision_pairs_local;
std::vector <partsize_t> collision_pairs_local;
std::vector <partsize_t> collision_pairs_global;
std::vector <partsize_t> collision_pairs_global;
Loading