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
dc24de0c
Commit
dc24de0c
authored
5 years ago
by
Cristian Lalescu
Browse files
Options
Downloads
Plain Diff
Merge branch 'bugfix/p2p_cylinder_collisions' into develop
parents
82f06978
0764ee9a
No related branches found
No related tags found
No related merge requests found
Pipeline
#74168
passed
5 years ago
Stage: build
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
cpp/particles/p2p_distr_mpi.hpp
+3
-3
3 additions, 3 deletions
cpp/particles/p2p_distr_mpi.hpp
with
3 additions
and
3 deletions
cpp/particles/p2p_distr_mpi.hpp
+
3
−
3
View file @
dc24de0c
...
@@ -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
));
}
}
...
...
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