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

Only link the limiter tasks if we are running with time-step limiter on.

parent 6bf0c948
No related branches found
No related tags found
1 merge request!701Timestep limiter upgrade
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 34 deletions
src/engine_maketasks.c
+ 34
− 34
View file @ f0f6e4a2
...@@ -1436,8 +1436,8 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1436,8 +1436,8 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
t_limiter, t->ci, with_cooling, t_limiter, t->ci, with_cooling,
with_limiter); with_limiter);
scheduler_addunlock(sched, t_force, t->ci->super->end_force); scheduler_addunlock(sched, t_force, t->ci->super->end_force);
scheduler_addunlock(sched, t->ci->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->ci->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep);
#else #else
/* Start by constructing the task for the second hydro loop */ /* Start by constructing the task for the second hydro loop */
...@@ -1457,8 +1457,8 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1457,8 +1457,8 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
engine_make_hydro_loops_dependencies(sched, t, t_force, t_limiter, t->ci, engine_make_hydro_loops_dependencies(sched, t, t_force, t_limiter, t->ci,
with_cooling, with_limiter); with_cooling, with_limiter);
scheduler_addunlock(sched, t_force, t->ci->super->end_force); scheduler_addunlock(sched, t_force, t->ci->super->end_force);
scheduler_addunlock(sched, t->ci->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->ci->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep);
#endif #endif
} }
...@@ -1502,9 +1502,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1502,9 +1502,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
t_limiter, t->ci, with_cooling, t_limiter, t->ci, with_cooling,
with_limiter); with_limiter);
scheduler_addunlock(sched, t_force, t->ci->super->end_force); scheduler_addunlock(sched, t_force, t->ci->super->end_force);
scheduler_addunlock(sched, t->ci->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->ci->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter);
} }
if (t->cj->nodeID == nodeID) { if (t->cj->nodeID == nodeID) {
if (t->ci->hydro.super != t->cj->hydro.super) { if (t->ci->hydro.super != t->cj->hydro.super) {
...@@ -1515,9 +1515,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1515,9 +1515,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
if (t->ci->super != t->cj->super) { if (t->ci->super != t->cj->super) {
scheduler_addunlock(sched, t_force, t->cj->super->end_force); scheduler_addunlock(sched, t_force, t->cj->super->end_force);
scheduler_addunlock(sched, t->cj->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->cj->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->cj->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->cj->super->timestep);
scheduler_addunlock(sched, t_limiter, t->cj->super->timestep_limiter); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->cj->super->timestep_limiter);
} }
} }
...@@ -1544,9 +1544,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1544,9 +1544,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
engine_make_hydro_loops_dependencies(sched, t, t_force, t_limiter, engine_make_hydro_loops_dependencies(sched, t, t_force, t_limiter,
t->ci, with_cooling, with_limiter); t->ci, with_cooling, with_limiter);
scheduler_addunlock(sched, t_force, t->ci->super->end_force); scheduler_addunlock(sched, t_force, t->ci->super->end_force);
scheduler_addunlock(sched, t->ci->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->ci->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter);
} }
if (t->cj->nodeID == nodeID) { if (t->cj->nodeID == nodeID) {
if (t->ci->hydro.super != t->cj->hydro.super) { if (t->ci->hydro.super != t->cj->hydro.super) {
...@@ -1556,9 +1556,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1556,9 +1556,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
if (t->ci->super != t->cj->super) { if (t->ci->super != t->cj->super) {
scheduler_addunlock(sched, t_force, t->cj->super->end_force); scheduler_addunlock(sched, t_force, t->cj->super->end_force);
scheduler_addunlock(sched, t->cj->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->cj->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->cj->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->cj->super->timestep);
scheduler_addunlock(sched, t_limiter, t->cj->super->timestep_limiter); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->cj->super->timestep_limiter);
} }
} }
...@@ -1601,9 +1601,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1601,9 +1601,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
t_limiter, t->ci, with_cooling, t_limiter, t->ci, with_cooling,
with_limiter); with_limiter);
scheduler_addunlock(sched, t_force, t->ci->super->end_force); scheduler_addunlock(sched, t_force, t->ci->super->end_force);
scheduler_addunlock(sched, t->ci->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->ci->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter);
} }
#else #else
...@@ -1627,9 +1627,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1627,9 +1627,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
engine_make_hydro_loops_dependencies(sched, t, t_force, t_limiter, engine_make_hydro_loops_dependencies(sched, t, t_force, t_limiter,
t->ci, with_cooling, with_limiter); t->ci, with_cooling, with_limiter);
scheduler_addunlock(sched, t_force, t->ci->super->end_force); scheduler_addunlock(sched, t_force, t->ci->super->end_force);
scheduler_addunlock(sched, t->ci->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->ci->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter);
} }
#endif #endif
} }
...@@ -1678,9 +1678,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1678,9 +1678,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
t_limiter, t->ci, with_cooling, t_limiter, t->ci, with_cooling,
with_limiter); with_limiter);
scheduler_addunlock(sched, t_force, t->ci->super->end_force); scheduler_addunlock(sched, t_force, t->ci->super->end_force);
scheduler_addunlock(sched, t->ci->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->ci->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter);
} }
if (t->cj->nodeID == nodeID) { if (t->cj->nodeID == nodeID) {
if (t->ci->hydro.super != t->cj->hydro.super) { if (t->ci->hydro.super != t->cj->hydro.super) {
...@@ -1691,9 +1691,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1691,9 +1691,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
if (t->ci->super != t->cj->super) { if (t->ci->super != t->cj->super) {
scheduler_addunlock(sched, t_force, t->cj->super->end_force); scheduler_addunlock(sched, t_force, t->cj->super->end_force);
scheduler_addunlock(sched, t->cj->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->cj->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->cj->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->cj->super->timestep);
scheduler_addunlock(sched, t_limiter, t->cj->super->timestep_limiter); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->cj->super->timestep_limiter);
} }
} }
...@@ -1721,9 +1721,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1721,9 +1721,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
t->ci, with_cooling, with_limiter); t->ci, with_cooling, with_limiter);
scheduler_addunlock(sched, t_force, t->ci->super->end_force); scheduler_addunlock(sched, t_force, t->ci->super->end_force);
scheduler_addunlock(sched, t->ci->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->ci->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep);
scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->ci->super->timestep_limiter);
} }
if (t->cj->nodeID == nodeID) { if (t->cj->nodeID == nodeID) {
if (t->ci->hydro.super != t->cj->hydro.super) { if (t->ci->hydro.super != t->cj->hydro.super) {
...@@ -1733,9 +1733,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements, ...@@ -1733,9 +1733,9 @@ void engine_make_extra_hydroloop_tasks_mapper(void *map_data, int num_elements,
if (t->ci->super != t->cj->super) { if (t->ci->super != t->cj->super) {
scheduler_addunlock(sched, t_force, t->cj->super->end_force); scheduler_addunlock(sched, t_force, t->cj->super->end_force);
scheduler_addunlock(sched, t->cj->super->kick2, t_limiter); if (with_limiter) scheduler_addunlock(sched, t->cj->super->kick2, t_limiter);
scheduler_addunlock(sched, t_limiter, t->cj->super->timestep); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->cj->super->timestep);
scheduler_addunlock(sched, t_limiter, t->cj->super->timestep_limiter); if (with_limiter) scheduler_addunlock(sched, t_limiter, t->cj->super->timestep_limiter);
} }
} }
#endif #endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment