Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
SWIFT
SWIFTsim
Commits
2f24853d
Commit
2f24853d
authored
8 years ago
by
Pedro Gonnet
Browse files
Options
Downloads
Plain Diff
Merge branch 'subset_sorting' of gitlab.cosma.dur.ac.uk:swift/swiftsim into subset_sorting
parents
ca250f50
51ea5f44
No related branches found
No related tags found
1 merge request
!343
Subset sorting
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/runner.c
+19
-9
19 additions, 9 deletions
src/runner.c
with
19 additions
and
9 deletions
src/runner.c
+
19
−
9
View file @
2f24853d
...
...
@@ -1504,11 +1504,9 @@ void runner_do_end_force(struct runner *r, struct cell *c, int timer) {
*
* @param r The runner thread.
* @param c The cell.
* @param clear_sorts Should we clear the sort flag and hence trigger a sort ?
* @param timer Are we timing this ?
*/
void
runner_do_recv_part
(
struct
runner
*
r
,
struct
cell
*
c
,
int
clear_sorts
,
int
timer
)
{
void
runner_do_recv_part
(
struct
runner
*
r
,
struct
cell
*
c
,
int
timer
)
{
#ifdef WITH_MPI
...
...
@@ -1524,8 +1522,10 @@ void runner_do_recv_part(struct runner *r, struct cell *c, int clear_sorts,
timebin_t
time_bin_max
=
0
;
float
h_max
=
0
.
f
;
/* Clear this cell's sorted mask. */
if
(
clear_sorts
)
c
->
sorted
=
0
;
#ifdef SWIFT_DEBUG_CHECKS
if
(
c
->
nodeID
==
engine_rank
)
error
(
"Updating a local cell!"
);
#endif
/* If this cell is a leaf, collect the particle data. */
if
(
!
c
->
split
)
{
...
...
@@ -1552,7 +1552,7 @@ void runner_do_recv_part(struct runner *r, struct cell *c, int clear_sorts,
else
{
for
(
int
k
=
0
;
k
<
8
;
k
++
)
{
if
(
c
->
progeny
[
k
]
!=
NULL
)
{
runner_do_recv_part
(
r
,
c
->
progeny
[
k
],
clear_sorts
,
0
);
runner_do_recv_part
(
r
,
c
->
progeny
[
k
],
0
);
ti_end_min
=
min
(
ti_end_min
,
c
->
progeny
[
k
]
->
ti_end_min
);
ti_end_max
=
max
(
ti_end_max
,
c
->
progeny
[
k
]
->
ti_end_max
);
h_max
=
max
(
h_max
,
c
->
progeny
[
k
]
->
h_max
);
...
...
@@ -1603,6 +1603,11 @@ void runner_do_recv_gpart(struct runner *r, struct cell *c, int timer) {
timebin_t
time_bin_min
=
num_time_bins
;
timebin_t
time_bin_max
=
0
;
#ifdef SWIFT_DEBUG_CHECKS
if
(
c
->
nodeID
==
engine_rank
)
error
(
"Updating a local cell!"
);
#endif
/* If this cell is a leaf, collect the particle data. */
if
(
!
c
->
split
)
{
...
...
@@ -1676,6 +1681,11 @@ void runner_do_recv_spart(struct runner *r, struct cell *c, int timer) {
timebin_t
time_bin_min
=
num_time_bins
;
timebin_t
time_bin_max
=
0
;
#ifdef SWIFT_DEBUG_CHECKS
if
(
c
->
nodeID
==
engine_rank
)
error
(
"Updating a local cell!"
);
#endif
/* If this cell is a leaf, collect the particle data. */
if
(
!
c
->
split
)
{
...
...
@@ -1942,11 +1952,11 @@ void *runner_main(void *data) {
cell_unpack_ti_ends
(
ci
,
t
->
buff
);
free
(
t
->
buff
);
}
else
if
(
t
->
subtype
==
task_subtype_xv
)
{
runner_do_recv_part
(
r
,
ci
,
1
,
1
);
runner_do_recv_part
(
r
,
ci
,
1
);
}
else
if
(
t
->
subtype
==
task_subtype_rho
)
{
runner_do_recv_part
(
r
,
ci
,
0
,
1
);
runner_do_recv_part
(
r
,
ci
,
1
);
}
else
if
(
t
->
subtype
==
task_subtype_gradient
)
{
runner_do_recv_part
(
r
,
ci
,
0
,
1
);
runner_do_recv_part
(
r
,
ci
,
1
);
}
else
if
(
t
->
subtype
==
task_subtype_gpart
)
{
runner_do_recv_gpart
(
r
,
ci
,
1
);
}
else
if
(
t
->
subtype
==
task_subtype_spart
)
{
...
...
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