Skip to content
Snippets Groups Projects
Commit a4816422 authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

intermediate clean up of function and debug messages

parent e3cba618
Branches
Tags
No related merge requests found
......@@ -30,10 +30,12 @@
template < class partsize_t>
std::vector<partsize_t> pairs2vec(std::set <std::pair <partsize_t,partsize_t>> ID_pairs){
std::vector<partsize_t> v(2*ID_pairs.size());
for(unsigned int i=0; i < ID_pairs.size(); i++)
int i = 0;
for(auto p: ID_pairs)
{
v[2*i] = (*std::next(ID_pairs.begin(), i)).first;
v[2*i+1] = (*std::next(ID_pairs.begin(), i)).second;
v[2*i] = p.first;
v[2*i+1] = p.second;
i++;
}
return v;
}
......@@ -41,9 +43,10 @@ std::vector<partsize_t> pairs2vec(std::set <std::pair <partsize_t,partsize_t>> I
template < class partsize_t>
std::set <std::pair <partsize_t,partsize_t>> vec2pairs(std::vector<partsize_t> v){
std::set <std::pair <partsize_t,partsize_t>> ID_pairs;
assert(v.size()%2 == 0);
for(unsigned int i=0; i < v.size()/2; i++)
{
DEBUG_MSG((std::to_string(v[2*i])+" "+std::to_string(v[2*i+1])+"\n").c_str());
//DEBUG_MSG((std::to_string(v[2*i])+" "+std::to_string(v[2*i+1])+"\n").c_str());
std::pair <partsize_t, partsize_t> single_collision_pair(v[2*i],v[2*i+1]);
ID_pairs.insert(single_collision_pair);
}
......@@ -84,7 +87,8 @@ public:
collision_counter += 1;
std::pair <partsize_t, partsize_t> single_collision_pair(idx_part1, idx_part2);
this->collision_pairs.insert(single_collision_pair);
//assert(idx_part1==0 and idx_part2==0);
//DEBUG_MSG("inside compute interaction idx_part1 = %ld and idx_part2 = %ld\n", idx_part1, idx_part2);
assert(idx_part1!=idx_part2);
}
void merge(const p2p_ghost_collisions& other){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment