Commit dc24de0c authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

Merge branch 'bugfix/p2p_cylinder_collisions' into develop

parents 82f06978 0764ee9a
Pipeline #74168 passed with stage
in 8 minutes and 3 seconds
...@@ -279,7 +279,7 @@ public: ...@@ -279,7 +279,7 @@ public:
real_number particles_positions[], real_number particles_positions[],
std::unique_ptr<real_number[]> particles_current_rhs[], const int nb_rhs, std::unique_ptr<real_number[]> particles_current_rhs[], const int nb_rhs,
partsize_t inout_index_particles[]){ partsize_t inout_index_particles[]){
TIMEZONE("compute_distr"); TIMEZONE("p2p_distr_mpi::compute_distr");
// Some processes might not be involved // Some processes might not be involved
if(nb_processes_involved <= my_rank){ if(nb_processes_involved <= my_rank){
...@@ -558,8 +558,8 @@ public: ...@@ -558,8 +558,8 @@ public:
lock_free_bool_array cells_locker(512); lock_free_bool_array cells_locker(512);
std::vector<std::unique_ptr<computer_class>> computer_for_all_threads(omp_get_num_threads()-1); std::vector<std::unique_ptr<computer_class>> computer_for_all_threads(omp_get_max_threads()-1);
for(int idxThread = 1 ; idxThread < omp_get_num_threads() ; ++idxThread){ for(int idxThread = 1 ; idxThread < omp_get_max_threads() ; ++idxThread){
computer_for_all_threads[idxThread-1].reset(new computer_class(in_computer)); computer_for_all_threads[idxThread-1].reset(new computer_class(in_computer));
} }
......
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