Skip to content
Snippets Groups Projects
Commit 8321d2a3 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Simplify the notation in engine_link_gravity_tasks().

parent 6ee3d489
No related branches found
No related tags found
1 merge request!576Gravity splittask (non-MPI)
Hide whitespace changes
Inline Side-by-side
Showing
with 28 additions and 24 deletions
src/engine.c
+ 28
− 24
View file @ 8321d2a3
...@@ -2683,37 +2683,41 @@ void engine_link_gravity_tasks(struct engine *e) { ...@@ -2683,37 +2683,41 @@ void engine_link_gravity_tasks(struct engine *e) {
struct scheduler *sched = &e->sched; struct scheduler *sched = &e->sched;
const int nodeID = e->nodeID; const int nodeID = e->nodeID;
const int nr_tasks = sched->nr_tasks; const int nr_tasks = sched->nr_tasks;
for (int k = 0; k < nr_tasks; k++) { for (int k = 0; k < nr_tasks; k++) {
/* Get a pointer to the task. */ /* Get a pointer to the task. */
struct task *t = &sched->tasks[k]; struct task *t = &sched->tasks[k];
/* Get the cells we act on */
const struct cell *ci = t->ci;
const struct cell *cj = t->cj;
/* Self-interaction for self-gravity? */ /* Self-interaction for self-gravity? */
if (t->type == task_type_self && t->subtype == task_subtype_grav) { if (t->type == task_type_self && t->subtype == task_subtype_grav) {
engine_make_self_gravity_dependencies(sched, t, t->ci); engine_make_self_gravity_dependencies(sched, t, ci);
} }
/* Self-interaction for external gravity ? */ /* Self-interaction for external gravity ? */
if (t->type == task_type_self && t->subtype == task_subtype_external_grav) { if (t->type == task_type_self && t->subtype == task_subtype_external_grav) {
engine_make_external_gravity_dependencies(sched, t, t->ci); engine_make_external_gravity_dependencies(sched, t, ci);
} }
/* Otherwise, pair interaction? */ /* Otherwise, pair interaction? */
else if (t->type == task_type_pair && t->subtype == task_subtype_grav) { else if (t->type == task_type_pair && t->subtype == task_subtype_grav) {
if (t->ci->nodeID == nodeID) { if (ci->nodeID == nodeID) {
engine_make_self_gravity_dependencies(sched, t, t->ci); engine_make_self_gravity_dependencies(sched, t, ci);
} }
if (t->cj->nodeID == nodeID && if (cj->nodeID == nodeID &&
t->ci->super_gravity != t->cj->super_gravity) { ci->super_gravity != cj->super_gravity) {
engine_make_self_gravity_dependencies(sched, t, t->cj); engine_make_self_gravity_dependencies(sched, t, cj);
} }
} }
...@@ -2721,8 +2725,8 @@ void engine_link_gravity_tasks(struct engine *e) { ...@@ -2721,8 +2725,8 @@ void engine_link_gravity_tasks(struct engine *e) {
/* Otherwise, sub-self interaction? */ /* Otherwise, sub-self interaction? */
else if (t->type == task_type_sub_self && t->subtype == task_subtype_grav) { else if (t->type == task_type_sub_self && t->subtype == task_subtype_grav) {
if (t->ci->nodeID == nodeID) { if (ci->nodeID == nodeID) {
engine_make_self_gravity_dependencies(sched, t, t->ci); engine_make_self_gravity_dependencies(sched, t, ci);
} }
} }
...@@ -2730,38 +2734,38 @@ void engine_link_gravity_tasks(struct engine *e) { ...@@ -2730,38 +2734,38 @@ void engine_link_gravity_tasks(struct engine *e) {
else if (t->type == task_type_sub_self && else if (t->type == task_type_sub_self &&
t->subtype == task_subtype_external_grav) { t->subtype == task_subtype_external_grav) {
if (t->ci->nodeID == nodeID) { if (ci->nodeID == nodeID) {
engine_make_external_gravity_dependencies(sched, t, t->ci); engine_make_external_gravity_dependencies(sched, t, ci);
} }
} }
/* Otherwise, sub-pair interaction? */ /* Otherwise, sub-pair interaction? */
else if (t->type == task_type_sub_pair && t->subtype == task_subtype_grav) { else if (t->type == task_type_sub_pair && t->subtype == task_subtype_grav) {
if (t->ci->nodeID == nodeID) { if (ci->nodeID == nodeID) {
engine_make_self_gravity_dependencies(sched, t, t->ci); engine_make_self_gravity_dependencies(sched, t, ci);
} }
if (t->cj->nodeID == nodeID && if (cj->nodeID == nodeID &&
t->ci->super_gravity != t->cj->super_gravity) { ci->super_gravity != cj->super_gravity) {
engine_make_self_gravity_dependencies(sched, t, t->cj); engine_make_self_gravity_dependencies(sched, t, cj);
} }
} }
/* Otherwise M-M interaction? */ /* Otherwise M-M interaction? */
else if (t->type == task_type_grav_mm) { else if (t->type == task_type_grav_mm) {
if (t->ci->nodeID == nodeID) { if (ci->nodeID == nodeID) {
scheduler_addunlock(sched, t->ci->super_gravity->init_grav, t); scheduler_addunlock(sched, ci->super_gravity->init_grav, t);
scheduler_addunlock(sched, t, t->ci->super_gravity->grav_down); scheduler_addunlock(sched, t, ci->super_gravity->grav_down);
} }
if (t->cj->nodeID == nodeID && if (cj->nodeID == nodeID &&
t->ci->super_gravity != t->cj->super_gravity) { ci->super_gravity != cj->super_gravity) {
scheduler_addunlock(sched, t->cj->super_gravity->init_grav, t); scheduler_addunlock(sched, cj->super_gravity->init_grav, t);
scheduler_addunlock(sched, t, t->cj->super_gravity->grav_down); scheduler_addunlock(sched, t, cj->super_gravity->grav_down);
} }
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment