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
8ee3c61b
Commit
8ee3c61b
authored
8 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Don't collect the gpart time_end in do_recv_cell as gparts are not sent around.
parent
6ae40fb2
No related branches found
No related tags found
2 merge requests
!310
Star particles and gparts links over MPI
,
!304
Star particle infrastructure
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/runner.c
+14
-8
14 additions, 8 deletions
src/runner.c
with
14 additions
and
8 deletions
src/runner.c
+
14
−
8
View file @
8ee3c61b
...
@@ -1339,9 +1339,9 @@ void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
...
@@ -1339,9 +1339,9 @@ void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
#ifdef WITH_MPI
#ifdef WITH_MPI
const
struct
part
*
restrict
parts
=
c
->
parts
;
const
struct
part
*
restrict
parts
=
c
->
parts
;
const
struct
gpart
*
restrict
gparts
=
c
->
gparts
;
//
const struct gpart *restrict gparts = c->gparts;
const
size_t
nr_parts
=
c
->
count
;
const
size_t
nr_parts
=
c
->
count
;
const
size_t
nr_gparts
=
c
->
gcount
;
//
const size_t nr_gparts = c->gcount;
const
integertime_t
ti_current
=
r
->
e
->
ti_current
;
const
integertime_t
ti_current
=
r
->
e
->
ti_current
;
TIMER_TIC
;
TIMER_TIC
;
...
@@ -1366,12 +1366,12 @@ void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
...
@@ -1366,12 +1366,12 @@ void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
error
(
"Received un-drifted particle !"
);
error
(
"Received un-drifted particle !"
);
#endif
#endif
}
}
for
(
size_t
k
=
0
;
k
<
nr_gparts
;
k
++
)
{
/*
for (size_t k = 0; k < nr_gparts; k++) {
*/
const
integertime_t
ti_end
=
/*
const integertime_t ti_end =
*/
get_integer_time_end
(
ti_current
,
gparts
[
k
].
time_bin
);
/*
get_integer_time_end(ti_current, gparts[k].time_bin);
*/
ti_end_min
=
min
(
ti_end_min
,
ti_end
);
/*
ti_end_min = min(ti_end_min, ti_end);
*/
ti_end_max
=
max
(
ti_end_max
,
ti_end
);
/*
ti_end_max = max(ti_end_max, ti_end);
*/
}
/* } */
}
}
...
@@ -1387,6 +1387,12 @@ void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
...
@@ -1387,6 +1387,12 @@ void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
}
}
}
}
#ifdef SWIFT_DEBUG_CHECKS
if
(
ti_end_min
<
ti_current
)
error
(
"Received a cell at an incorrect time c->ti_end_min=%lld, e->ti_current=%lld."
,
ti_end_min
,
ti_current
);
#endif
/* ... and store. */
/* ... and store. */
c
->
ti_end_min
=
ti_end_min
;
c
->
ti_end_min
=
ti_end_min
;
c
->
ti_end_max
=
ti_end_max
;
c
->
ti_end_max
=
ti_end_max
;
...
...
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