diff --git a/doc/RTD/source/Task/adding_your_own.rst b/doc/RTD/source/Task/adding_your_own.rst
index fe89807e2531d64c399064b05280ffc677204002..95bed21c5d8833a62242aedb89e443ead01c5657 100644
--- a/doc/RTD/source/Task/adding_your_own.rst
+++ b/doc/RTD/source/Task/adding_your_own.rst
@@ -217,7 +217,8 @@ and the second kick cannot be done before the cooling::
The next step is to activate your task
-in ``engine_marktasks_mapper`` in ``engine_marktasks.c``::
+in the relevant section of ``cell_unskip.c`` (things are split
+by type of particles the tasks act on)::
else if (t->type == task_type_cooling || t->type == task_type_sourceterms) {
if (cell_is_active_hydro(t->ci, e)) scheduler_activate(s, t);
diff --git a/doc/RTD/source/Task/adding_your_own_neighbour_loop.rst b/doc/RTD/source/Task/adding_your_own_neighbour_loop.rst
index 937421eb7e80e136c5d66a0b2706a9d104d94212..076245820f3e3d88563f7f3b2b07c8f37671ea11 100644
--- a/doc/RTD/source/Task/adding_your_own_neighbour_loop.rst
+++ b/doc/RTD/source/Task/adding_your_own_neighbour_loop.rst
@@ -296,8 +296,9 @@ call::
-The next step is to activate your task
-in ``engine_marktasks_mapper`` in ``engine_marktasks.c``::
+The next step is to activate your task in the relevant section of
+ ``cell_unskip.c`` (things are split by the type of particles the
+ tasks run on)::
/* Single-cell task? */
diff --git a/src/Makefile.am b/src/Makefile.am
index bad2cc4dd23c153a97a2e1094de15ccbe7019100..429485fed58b4245f57c4142c6d5ae6fb74f6ba4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -170,7 +170,7 @@ AM_SOURCES += runner_sinks.c
AM_SOURCES += cell.c cell_convert_part.c cell_drift.c cell_lock.c cell_pack.c cell_split.c
AM_SOURCES += cell_unskip.c cell_grid.c
AM_SOURCES += engine.c engine_maketasks.c engine_split_particles.c engine_strays.c
-AM_SOURCES += engine_marktasks.c engine_drift.c engine_unskip.c engine_collect_end_of_step.c
+AM_SOURCES += engine_drift.c engine_unskip.c engine_collect_end_of_step.c
AM_SOURCES += engine_redistribute.c engine_fof.c engine_proxy.c engine_io.c engine_config.c
AM_SOURCES += queue.c task.c timers.c debug.c scheduler.c proxy.c version.c
AM_SOURCES += common_io.c common_io_copy.c common_io_cells.c common_io_fields.c
diff --git a/src/cell.c b/src/cell.c
index 3c3e37bed77f1e408f8a1c8954b32df9273a214d..a610135c87f479f5cc4a7eff52dc230d2286b47e 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -1062,38 +1062,6 @@ void cell_clear_limiter_flags(struct cell *c, void *data) {
cell_flag_do_hydro_limiter | cell_flag_do_hydro_sub_limiter);
}
-void cell_clear_unskip_flags(struct cell *c) {
-
-#ifdef SWIFT_DEBUG_CHECKS
-
- if (c->split) {
- for (int k = 0; k < 8; ++k) {
- if (c->progeny[k] != NULL) cell_clear_unskip_flags(c->progeny[k]);
- }
- }
-
- cell_clear_flag(
- c, cell_flag_do_stars_resort | cell_flag_do_stars_drift |
- cell_flag_do_stars_sub_drift | cell_flag_do_hydro_drift |
- cell_flag_do_hydro_sub_drift | cell_flag_do_hydro_sync |
- cell_flag_do_hydro_sub_sync | cell_flag_do_grav_drift |
- cell_flag_do_grav_sub_drift | cell_flag_do_bh_drift |
- cell_flag_do_bh_sub_drift | cell_flag_do_sink_drift |
- cell_flag_do_sink_sub_drift | cell_flag_do_hydro_limiter |
- cell_flag_do_hydro_sub_limiter | cell_flag_do_hydro_sub_sort |
- cell_flag_do_stars_sub_sort | cell_flag_do_rt_sub_sort |
- cell_flag_unskip_self_grav_processed |
- cell_flag_unskip_pair_grav_processed);
-
- c->hydro.do_sort = 0;
- c->stars.do_sort = 0;
- c->hydro.requires_sorts = 0;
- c->stars.requires_sorts = 0;
-#else
- error("Calling debugging code without debugging flag activated.");
-#endif
-}
-
/**
* @brief Set the super-cell pointers for all cells in a hierarchy.
*
diff --git a/src/cell.h b/src/cell.h
index 0f88472de30cf483bf2f8026155f29422983ecff..2bb2d6976964461d797069a24c9bad9f9e71cdf3 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -658,7 +658,6 @@ void cell_check_spart_pos(const struct cell *c,
void cell_check_sort_flags(const struct cell *c);
void cell_clear_stars_sort_flags(struct cell *c, const int unused_flags);
void cell_clear_hydro_sort_flags(struct cell *c, const int unused_flags);
-void cell_clear_unskip_flags(struct cell *c);
int cell_has_tasks(struct cell *c);
void cell_remove_part(const struct engine *e, struct cell *c, struct part *p,
struct xpart *xp);
diff --git a/src/engine.c b/src/engine.c
index dcc402d82974dc0641f6fec15c9f997881367302..3b992186dcdf2e9907accda1598cc084f4156603 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -146,10 +146,6 @@ int engine_rank;
/** The current step of the engine as a global variable (for messages). */
int engine_current_step;
-#ifdef SWIFT_DEBUG_CHECKS
-extern int activate_by_unskip;
-#endif
-
/**
* @brief Link a density/force task to a cell.
*
@@ -1451,50 +1447,10 @@ void engine_rebuild(struct engine *e, const int repartitioned,
space_check_unskip_flags(e->s);
#endif
- /* Run through the tasks and mark as skip or not. */
-#ifdef SWIFT_DEBUG_CHECKS
- activate_by_unskip = 1;
-#endif
+ /* Run through the cells, and their tasks to mark as unskipped. */
engine_unskip(e);
if (e->forcerebuild) error("engine_unskip faled after a rebuild!");
-#ifdef SWIFT_DEBUG_CHECKS
-
- /* Reset all the tasks */
- for (int i = 0; i < e->sched.nr_tasks; ++i) {
- e->sched.tasks[i].skip = 1;
- }
- for (int i = 0; i < e->sched.active_count; ++i) {
- e->sched.tid_active[i] = -1;
- }
- e->sched.active_count = 0;
- for (int i = 0; i < e->s->nr_cells; ++i) {
- cell_clear_unskip_flags(&e->s->cells_top[i]);
- }
-
- /* Now run the (legacy) marktasks */
- activate_by_unskip = 0;
- engine_marktasks(e);
-
- /* Verify that the two task activation procedures match */
- for (int i = 0; i < e->sched.nr_tasks; ++i) {
- struct task *t = &e->sched.tasks[i];
-
- if (t->activated_by_unskip && !t->activated_by_marktask) {
- error("Task %s/%s activated by unskip and not by marktask!",
- taskID_names[t->type], subtaskID_names[t->subtype]);
- }
-
- if (!t->activated_by_unskip && t->activated_by_marktask) {
- error("Task %s/%s activated by marktask and not by unskip!",
- taskID_names[t->type], subtaskID_names[t->subtype]);
- }
-
- t->activated_by_marktask = 0;
- t->activated_by_unskip = 0;
- }
-#endif
-
/* Print the status of the system */
if (e->verbose) engine_print_task_counts(e);
@@ -2217,7 +2173,7 @@ void engine_init_particles(struct engine *e, int flag_entropy_ICs,
/* Correct what we did (e.g. in PE-SPH, need to recompute rho_bar) */
if (hydro_need_extra_init_loop) {
- engine_marktasks(e);
+ engine_unskip(e);
engine_skip_force_and_kick(e);
engine_launch(e, "tasks");
}
diff --git a/src/engine.h b/src/engine.h
index 4509bc669d8925ab0885813c4991c6ce865e76c7..50e98011c29ff3e2cd731ebce5fcce6b8c5df085 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -774,9 +774,6 @@ void engine_maketasks(struct engine *e);
/* Function prototypes, engine_maketasks.c. */
void engine_make_fof_tasks(struct engine *e);
-/* Function prototypes, engine_marktasks.c. */
-int engine_marktasks(struct engine *e);
-
/* Function prototypes, engine_split_particles.c. */
void engine_split_gas_particles(struct engine *e);
void engine_init_split_gas_particles(struct engine *e);
diff --git a/src/engine_marktasks.c b/src/engine_marktasks.c
deleted file mode 100644
index fdb5385245c758eca497f3ee24cb23f62a1feb8f..0000000000000000000000000000000000000000
--- a/src/engine_marktasks.c
+++ /dev/null
@@ -1,1742 +0,0 @@
-/*******************************************************************************
- * This file is part of SWIFT.
- * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
- * Matthieu Schaller (schaller@strw.leidenuniv.nl)
- * 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
- * Angus Lepper (angus.lepper@ed.ac.uk)
- * 2016 John A. Regan (john.a.regan@durham.ac.uk)
- * Tom Theuns (tom.theuns@durham.ac.uk)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- ******************************************************************************/
-
-/* Config parameters. */
-#include <config.h>
-
-/* Some standard headers. */
-#include <stdlib.h>
-#include <unistd.h>
-
-/* MPI headers. */
-#ifdef WITH_MPI
-#include <mpi.h>
-#endif
-
-/* Load the profiler header, if needed. */
-#ifdef WITH_PROFILER
-#include <gperftools/profiler.h>
-#endif
-
-/* This object's header. */
-#include "engine.h"
-
-/* Local headers. */
-#include "active.h"
-#include "atomic.h"
-#include "cell.h"
-#include "clocks.h"
-#include "cycle.h"
-#include "debug.h"
-#include "error.h"
-#include "feedback.h"
-#include "proxy.h"
-#include "task.h"
-#include "timers.h"
-
-/**
- * @brief Mark tasks to be un-skipped and set the sort flags accordingly.
- * Threadpool mapper function.
- *
- * @param map_data pointer to the tasks
- * @param num_elements number of tasks
- * @param extra_data pointer to int that will define if a rebuild is needed.
- */
-void engine_marktasks_mapper(void *map_data, int num_elements,
- void *extra_data) {
- /* Unpack the arguments. */
- struct task *tasks = (struct task *)map_data;
- size_t *rebuild_space = &((size_t *)extra_data)[1];
- struct scheduler *s = (struct scheduler *)(((size_t *)extra_data)[2]);
- struct engine *e = (struct engine *)((size_t *)extra_data)[0];
- const int nodeID = e->nodeID;
- const int with_timestep_limiter = e->policy & engine_policy_timestep_limiter;
- const int with_timestep_sync = e->policy & engine_policy_timestep_sync;
- const int with_sinks = e->policy & engine_policy_sinks;
- const int with_stars = e->policy & engine_policy_stars;
- const int with_star_formation = (e->policy & engine_policy_star_formation);
- const int with_star_formation_sink = with_sinks && with_stars;
- const int with_feedback = e->policy & engine_policy_feedback;
-
- for (int ind = 0; ind < num_elements; ind++) {
-
- /* Get basic task information */
- struct task *t = &tasks[ind];
- const enum task_types t_type = t->type;
- const enum task_subtypes t_subtype = t->subtype;
-
- /* Single-cell task? */
- if (t_type == task_type_self || t_type == task_type_sub_self) {
-
- /* Local pointer. */
- struct cell *ci = t->ci;
-
-#ifdef SWIFT_DEBUG_CHECKS
- if (ci->nodeID != nodeID) error("Non-local self task found");
-#endif
-
- const int ci_active_hydro = cell_is_active_hydro(ci, e);
- const int ci_active_gravity = cell_is_active_gravity(ci, e);
- const int ci_active_black_holes =
- ci->black_holes.count > 0 && cell_is_active_black_holes(ci, e);
- const int ci_active_sinks =
- cell_is_active_sinks(ci, e) || ci_active_hydro;
- const int ci_active_stars = cell_need_activating_stars(
- ci, e, with_star_formation, with_star_formation_sink);
- const int ci_active_rt = cell_is_rt_active(ci, e);
-
- /* Activate the hydro drift */
- if (t_type == task_type_self && t_subtype == task_subtype_density) {
- if (ci_active_hydro) {
- scheduler_activate(s, t);
- cell_activate_drift_part(ci, s);
- if (with_timestep_limiter) cell_activate_limiter(ci, s);
- }
- }
-
- /* Store current values of dx_max and h_max. */
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_density) {
- if (ci_active_hydro) {
- scheduler_activate(s, t);
- cell_activate_subcell_hydro_tasks(ci, NULL, s, with_timestep_limiter);
- if (with_timestep_limiter) cell_activate_limiter(ci, s);
- }
- }
-
- else if (t_type == task_type_self && t_subtype == task_subtype_force) {
- if (ci_active_hydro) scheduler_activate(s, t);
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_force) {
- if (ci_active_hydro) scheduler_activate(s, t);
- }
-
- else if (t->type == task_type_self &&
- t->subtype == task_subtype_limiter) {
- if (ci_active_hydro) scheduler_activate(s, t);
- }
-
- else if (t->type == task_type_sub_self &&
- t->subtype == task_subtype_limiter) {
- if (ci_active_hydro) scheduler_activate(s, t);
- }
-
- else if (t_type == task_type_self && t_subtype == task_subtype_gradient) {
- if (ci_active_hydro) scheduler_activate(s, t);
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_gradient) {
- if (ci_active_hydro) scheduler_activate(s, t);
- }
-
- /* Activate the star density */
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_stars_density) {
- if (ci_active_stars) {
- scheduler_activate(s, t);
- cell_activate_drift_part(ci, s);
- cell_activate_drift_spart(ci, s);
- if (with_timestep_sync) cell_activate_sync_part(ci, s);
- }
- }
-
- /* Store current values of dx_max and h_max. */
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_stars_density) {
- if (ci_active_stars) {
- scheduler_activate(s, t);
- cell_activate_subcell_stars_tasks(ci, NULL, s, with_star_formation,
- with_star_formation_sink,
- with_timestep_sync);
- }
- }
-
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_stars_prep1) {
- if (ci_active_stars) {
- scheduler_activate(s, t);
- }
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_stars_prep1) {
- if (ci_active_stars) scheduler_activate(s, t);
- }
-
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_stars_prep2) {
- if (ci_active_stars) {
- scheduler_activate(s, t);
- }
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_stars_prep2) {
- if (ci_active_stars) scheduler_activate(s, t);
- }
-
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_stars_feedback) {
- if (ci_active_stars) {
- scheduler_activate(s, t);
- }
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_stars_feedback) {
- if (ci_active_stars) scheduler_activate(s, t);
- }
-
- /* Activate the sink swallow task */
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_sink_swallow) {
- if (ci_active_sinks) {
- scheduler_activate(s, t);
- cell_activate_drift_part(ci, s);
- cell_activate_drift_sink(ci, s);
- cell_activate_sink_formation_tasks(ci->top, s);
- if (with_timestep_sync) cell_activate_sync_part(ci, s);
- }
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_sink_swallow) {
- if (ci_active_sinks) {
- scheduler_activate(s, t);
- cell_activate_subcell_sinks_tasks(ci, NULL, s, with_timestep_sync);
- }
- }
-
- /* Activate the sink do sink swallow */
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_sink_do_sink_swallow) {
- if (ci_active_sinks) {
- scheduler_activate(s, t);
- }
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_sink_do_sink_swallow) {
- if (ci_active_sinks) {
- scheduler_activate(s, t);
- }
- }
-
- /* Activate the sink do gas swallow */
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_sink_do_gas_swallow) {
- if (ci_active_sinks) {
- scheduler_activate(s, t);
- }
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_sink_do_gas_swallow) {
- if (ci_active_sinks) {
- scheduler_activate(s, t);
- }
- }
-
- /* Activate the black hole density */
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_bh_density) {
- if (ci_active_black_holes) {
- scheduler_activate(s, t);
- cell_activate_drift_part(ci, s);
- cell_activate_drift_bpart(ci, s);
- if (with_timestep_sync) cell_activate_sync_part(ci, s);
- }
- }
-
- /* Store current values of dx_max and h_max. */
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_bh_density) {
- if (ci_active_black_holes) {
- scheduler_activate(s, t);
- cell_activate_subcell_black_holes_tasks(ci, NULL, s,
- with_timestep_sync);
- }
- }
-
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_bh_swallow) {
- if (ci_active_black_holes) {
- scheduler_activate(s, t);
- }
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_bh_swallow) {
- if (ci_active_black_holes) scheduler_activate(s, t);
- }
-
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_do_gas_swallow) {
- if (ci_active_black_holes) {
- scheduler_activate(s, t);
- }
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_do_gas_swallow) {
- if (ci_active_black_holes) scheduler_activate(s, t);
- }
-
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_do_bh_swallow) {
- if (ci_active_black_holes) {
- scheduler_activate(s, t);
- }
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_do_bh_swallow) {
- if (ci_active_black_holes) scheduler_activate(s, t);
- }
-
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_bh_feedback) {
- if (ci_active_black_holes) {
- scheduler_activate(s, t);
- }
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_bh_feedback) {
- if (ci_active_black_holes) scheduler_activate(s, t);
- }
-
- /* Activate the gravity drift */
- else if (t_type == task_type_self && t_subtype == task_subtype_grav) {
- if (ci_active_gravity) {
- scheduler_activate(s, t);
- cell_activate_subcell_grav_tasks(t->ci, NULL, s);
- }
- }
-
- /* Activate the gravity drift */
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_external_grav) {
- if (ci_active_gravity) {
- scheduler_activate(s, t);
- cell_activate_subcell_external_grav_tasks(t->ci, s);
- }
- }
-
- /* Activate RT tasks */
- else if (t_type == task_type_self &&
- t_subtype == task_subtype_rt_gradient) {
- if (ci_active_rt) scheduler_activate(s, t);
- }
-
- else if (t_type == task_type_sub_self &&
- t_subtype == task_subtype_rt_gradient) {
- if (ci_active_rt) {
- scheduler_activate(s, t);
- cell_activate_subcell_rt_tasks(ci, NULL, s, /*sub_cycle=*/0);
- }
- }
-
- else if (t_subtype == task_subtype_rt_transport) {
- if (ci_active_rt) scheduler_activate(s, t);
- }
-
-#ifdef SWIFT_DEBUG_CHECKS
- else {
- error("Invalid task type / sub-type encountered");
- }
-#endif
- }
-
- /* Pair? */
- else if (t_type == task_type_pair || t_type == task_type_sub_pair) {
-
- /* Local pointers. */
- struct cell *ci = t->ci;
- struct cell *cj = t->cj;
-#ifdef WITH_MPI
- const int ci_nodeID = ci->nodeID;
- const int cj_nodeID = cj->nodeID;
-#else
- const int ci_nodeID = nodeID;
- const int cj_nodeID = nodeID;
-#endif
- const int ci_active_hydro = cell_is_active_hydro(ci, e);
- const int cj_active_hydro = cell_is_active_hydro(cj, e);
-
- const int ci_active_gravity = cell_is_active_gravity(ci, e);
- const int cj_active_gravity = cell_is_active_gravity(cj, e);
-
- const int ci_active_black_holes =
- ci->black_holes.count > 0 && cell_is_active_black_holes(ci, e);
- const int cj_active_black_holes =
- cj->black_holes.count > 0 && cell_is_active_black_holes(cj, e);
-
- const int ci_active_sinks =
- cell_is_active_sinks(ci, e) || ci_active_hydro;
- const int cj_active_sinks =
- cell_is_active_sinks(cj, e) || cj_active_hydro;
-
- const int ci_active_stars = cell_need_activating_stars(
- ci, e, with_star_formation, with_star_formation_sink);
- const int cj_active_stars = cell_need_activating_stars(
- cj, e, with_star_formation, with_star_formation_sink);
-
- const int ci_active_rt = cell_is_rt_active(ci, e);
- const int cj_active_rt = cell_is_rt_active(cj, e);
-
- /* Only activate tasks that involve a local active cell. */
- if ((t_subtype == task_subtype_density ||
- t_subtype == task_subtype_gradient ||
- t_subtype == task_subtype_limiter ||
- t_subtype == task_subtype_force) &&
- ((ci_active_hydro && ci_nodeID == nodeID) ||
- (cj_active_hydro && cj_nodeID == nodeID))) {
-
- scheduler_activate(s, t);
-
- /* Set the correct sorting flags */
- if (t_type == task_type_pair && t_subtype == task_subtype_density) {
-
- /* Store some values. */
- atomic_or(&ci->hydro.requires_sorts, 1 << t->flags);
- atomic_or(&cj->hydro.requires_sorts, 1 << t->flags);
- ci->hydro.dx_max_sort_old = ci->hydro.dx_max_sort;
- cj->hydro.dx_max_sort_old = cj->hydro.dx_max_sort;
-
- /* Activate the hydro drift tasks. */
- if (ci_nodeID == nodeID) cell_activate_drift_part(ci, s);
- if (cj_nodeID == nodeID) cell_activate_drift_part(cj, s);
-
- /* And the limiter */
- if (ci_nodeID == nodeID && with_timestep_limiter)
- cell_activate_limiter(ci, s);
- if (cj_nodeID == nodeID && with_timestep_limiter)
- cell_activate_limiter(cj, s);
-
- /* Check the sorts and activate them if needed. */
- cell_activate_hydro_sorts(ci, t->flags, s);
- cell_activate_hydro_sorts(cj, t->flags, s);
-
- }
-
- /* Store current values of dx_max and h_max. */
- else if (t_type == task_type_sub_pair &&
- t_subtype == task_subtype_density) {
- cell_activate_subcell_hydro_tasks(t->ci, t->cj, s,
- with_timestep_limiter);
- }
- }
-
- /* Stars density */
- else if ((t_subtype == task_subtype_stars_density) &&
- (ci_active_stars || cj_active_stars) &&
- (ci_nodeID == nodeID || cj_nodeID == nodeID)) {
-
- scheduler_activate(s, t);
-
- /* Set the correct sorting flags */
- if (t_type == task_type_pair) {
-
- /* Add stars_in dependencies for each cell that is part of
- * a pair task as to not miss any dependencies */
- if (ci_nodeID == nodeID)
- scheduler_activate(s, ci->hydro.super->stars.stars_in);
- if (cj_nodeID == nodeID)
- scheduler_activate(s, cj->hydro.super->stars.stars_in);
-
- /* Do ci */
- if (ci_active_stars) {
-
- /* stars for ci */
- atomic_or(&ci->stars.requires_sorts, 1 << t->flags);
- ci->stars.dx_max_sort_old = ci->stars.dx_max_sort;
-
- /* hydro for cj */
- atomic_or(&cj->hydro.requires_sorts, 1 << t->flags);
- cj->hydro.dx_max_sort_old = cj->hydro.dx_max_sort;
-
- /* Activate the drift tasks. */
- if (ci_nodeID == nodeID) cell_activate_drift_spart(ci, s);
- if (cj_nodeID == nodeID) cell_activate_drift_part(cj, s);
- if (cj_nodeID == nodeID && with_timestep_sync)
- cell_activate_sync_part(cj, s);
-
- /* Check the sorts and activate them if needed. */
- cell_activate_hydro_sorts(cj, t->flags, s);
- cell_activate_stars_sorts(ci, t->flags, s);
- }
-
- /* Do cj */
- if (cj_active_stars) {
-
- /* hydro for ci */
- atomic_or(&ci->hydro.requires_sorts, 1 << t->flags);
- ci->hydro.dx_max_sort_old = ci->hydro.dx_max_sort;
-
- /* stars for cj */
- atomic_or(&cj->stars.requires_sorts, 1 << t->flags);
- cj->stars.dx_max_sort_old = cj->stars.dx_max_sort;
-
- /* Activate the drift tasks. */
- if (ci_nodeID == nodeID) cell_activate_drift_part(ci, s);
- if (cj_nodeID == nodeID) cell_activate_drift_spart(cj, s);
- if (ci_nodeID == nodeID && with_timestep_sync)
- cell_activate_sync_part(ci, s);
-
- /* Check the sorts and activate them if needed. */
- cell_activate_hydro_sorts(ci, t->flags, s);
- cell_activate_stars_sorts(cj, t->flags, s);
- }
- }
-
- /* Store current values of dx_max and h_max. */
- else if (t_type == task_type_sub_pair &&
- t_subtype == task_subtype_stars_density) {
-
- /* Add stars_in dependencies for each cell that is part of
- * a pair/sub_pair task as to not miss any dependencies */
- if (ci_nodeID == nodeID)
- scheduler_activate(s, ci->hydro.super->stars.stars_in);
- if (cj_nodeID == nodeID)
- scheduler_activate(s, cj->hydro.super->stars.stars_in);
-
- cell_activate_subcell_stars_tasks(ci, cj, s, with_star_formation,
- with_star_formation_sink,
- with_timestep_sync);
- }
- }
-
- /* Stars prep1 */
- else if (t_subtype == task_subtype_stars_prep1) {
-
- /* We only want to activate the task if the cell is active and is
- going to update some gas on the *local* node */
- if ((ci_nodeID == nodeID && cj_nodeID == nodeID) &&
- (ci_active_stars || cj_active_stars)) {
-
- scheduler_activate(s, t);
-
- /* If there are active sparts in ci, activate hydro ghost in cj */
- if (ci_active_stars)
- scheduler_activate(s, cj->hydro.super->hydro.prep1_ghost);
- /* If there are active sparts in cj, activate hydro ghost in ci */
- if (cj_active_stars)
- scheduler_activate(s, ci->hydro.super->hydro.prep1_ghost);
-
- } else if ((ci_nodeID == nodeID && cj_nodeID != nodeID) &&
- (cj_active_stars)) {
-
- scheduler_activate(s, t);
- /* If there are active sparts in cj, activate hydro ghost in ci */
- scheduler_activate(s, ci->hydro.super->hydro.prep1_ghost);
-
- } else if ((ci_nodeID != nodeID && cj_nodeID == nodeID) &&
- (ci_active_stars)) {
-
- scheduler_activate(s, t);
- /* If there are active sparts in ci, activate hydro ghost in cj */
- scheduler_activate(s, cj->hydro.super->hydro.prep1_ghost);
- }
- }
-
- /* Stars prep2 */
- else if (t_subtype == task_subtype_stars_prep2) {
-
- /* We only want to activate the task if the cell is active and is
- going to update some sparts on the *local* node */
- if ((ci_nodeID == nodeID && cj_nodeID == nodeID) &&
- (ci_active_stars || cj_active_stars)) {
-
- scheduler_activate(s, t);
-
- } else if ((ci_nodeID == nodeID && cj_nodeID != nodeID) &&
- (ci_active_stars)) {
-
- scheduler_activate(s, t);
-
- } else if ((ci_nodeID != nodeID && cj_nodeID == nodeID) &&
- (cj_active_stars)) {
-
- scheduler_activate(s, t);
- }
- }
-
- /* Stars feedback */
- else if (t_subtype == task_subtype_stars_feedback) {
-
- /* We only want to activate the task if the cell is active and is
- going to update some gas on the *local* node */
- if ((ci_nodeID == nodeID && cj_nodeID == nodeID) &&
- (ci_active_stars || cj_active_stars)) {
-
- scheduler_activate(s, t);
-
- } else if ((ci_nodeID == nodeID && cj_nodeID != nodeID) &&
- (cj_active_stars)) {
-
- scheduler_activate(s, t);
-
- } else if ((ci_nodeID != nodeID && cj_nodeID == nodeID) &&
- (ci_active_stars)) {
-
- scheduler_activate(s, t);
- }
-
- if (t->type == task_type_pair || t->type == task_type_sub_pair) {
-
- if (ci_active_stars || cj_active_stars) {
- /* Add stars_out dependencies for each cell that is part of
- * a pair/sub_pair task as to not miss any dependencies */
- if (ci_nodeID == nodeID)
- scheduler_activate(s, ci->hydro.super->stars.stars_out);
- if (cj_nodeID == nodeID)
- scheduler_activate(s, cj->hydro.super->stars.stars_out);
- }
- }
- }
-
- /* Black_Holes density */
- else if ((t_subtype == task_subtype_bh_density ||
- t_subtype == task_subtype_bh_swallow ||
- t_subtype == task_subtype_do_gas_swallow ||
- t_subtype == task_subtype_do_bh_swallow ||
- t_subtype == task_subtype_bh_feedback) &&
- (ci_active_black_holes || cj_active_black_holes) &&
- (ci_nodeID == nodeID || cj_nodeID == nodeID)) {
-
- scheduler_activate(s, t);
-
- /* Set the correct drifting flags */
- if (t_type == task_type_pair && t_subtype == task_subtype_bh_density) {
-
- /* Note we need to drift *both* BH cells to deal with BH<->BH swallows
- * But we only need to drift the gas cell if the *other* cell has an
- * active BH */
- if (ci_nodeID == nodeID) cell_activate_drift_bpart(ci, s);
- if (ci_nodeID == nodeID && cj_active_black_holes)
- cell_activate_drift_part(ci, s);
-
- if (cj_nodeID == nodeID && ci_active_black_holes)
- cell_activate_drift_part(cj, s);
- if (cj_nodeID == nodeID) cell_activate_drift_bpart(cj, s);
-
- if (ci_nodeID == nodeID && cj_active_black_holes &&
- with_timestep_sync)
- cell_activate_sync_part(ci, s);
- if (cj_nodeID == nodeID && ci_active_black_holes &&
- with_timestep_sync)
- cell_activate_sync_part(cj, s);
- }
-
- /* Store current values of dx_max and h_max. */
- else if (t_type == task_type_sub_pair &&
- t_subtype == task_subtype_bh_density) {
- cell_activate_subcell_black_holes_tasks(ci, cj, s,
- with_timestep_sync);
- }
-
- if ((t_type == task_type_pair || t_type == task_type_sub_pair) &&
- t_subtype == task_subtype_bh_density) {
-
- /* Activate bh_in for each cell that is part of
- * a pair task as to not miss any dependencies */
- if (ci_nodeID == nodeID)
- scheduler_activate(s, ci->hydro.super->black_holes.black_holes_in);
- if (cj_nodeID == nodeID)
- scheduler_activate(s, cj->hydro.super->black_holes.black_holes_in);
- }
-
- if ((t_type == task_type_pair || t_type == task_type_sub_pair) &&
- t_subtype == task_subtype_bh_feedback) {
-
- /* Add bh_out dependencies for each cell that is part of
- * a pair/sub_pair task as to not miss any dependencies */
- if (ci_nodeID == nodeID)
- scheduler_activate(s, ci->hydro.super->black_holes.black_holes_out);
- if (cj_nodeID == nodeID)
- scheduler_activate(s, cj->hydro.super->black_holes.black_holes_out);
- }
- }
-
- /* Gravity */
- else if ((t_subtype == task_subtype_grav) &&
- ((ci_active_gravity && ci_nodeID == nodeID) ||
- (cj_active_gravity && cj_nodeID == nodeID))) {
-
- scheduler_activate(s, t);
-
- if (t_type == task_type_pair && t_subtype == task_subtype_grav) {
- /* Activate the gravity drift */
- cell_activate_subcell_grav_tasks(t->ci, t->cj, s);
- }
-
-#ifdef SWIFT_DEBUG_CHECKS
- else if (t_type == task_type_sub_pair &&
- t_subtype == task_subtype_grav) {
- error("Invalid task sub-type encountered");
- }
-#endif
- }
-
- /* Sink tasks */
-
- else if ((t_subtype == task_subtype_sink_swallow ||
- t_subtype == task_subtype_sink_do_sink_swallow ||
- t_subtype == task_subtype_sink_do_gas_swallow) &&
- (ci_active_sinks || cj_active_sinks) &&
- (ci_nodeID == nodeID || cj_nodeID == nodeID)) {
-
- scheduler_activate(s, t);
-
- /* New implementation based on bh */
- /* Set the correct drifting flags and sink_formation */
- if (t_type == task_type_pair &&
- t_subtype == task_subtype_sink_swallow) {
- if (ci_nodeID == nodeID) cell_activate_drift_sink(ci, s);
- if (ci_nodeID == nodeID) cell_activate_drift_part(ci, s);
- if (ci_nodeID == nodeID)
- cell_activate_sink_formation_tasks(ci->top, s);
-
- if (cj_nodeID == nodeID) cell_activate_drift_part(cj, s);
- if (cj_nodeID == nodeID) cell_activate_drift_sink(cj, s);
- if (cj_nodeID == nodeID)
- cell_activate_sink_formation_tasks(cj->top, s);
-
- /* Activate sink_in for each cell that is part of
- * a pair task as to not miss any dependencies */
- if (ci_nodeID == nodeID)
- scheduler_activate(s, ci->hydro.super->sinks.sink_in);
- if (cj_nodeID == nodeID)
- scheduler_activate(s, cj->hydro.super->sinks.sink_in);
- }
-
- if ((t_type == task_type_pair || t_type == task_type_sub_pair) &&
- t_subtype == task_subtype_sink_do_sink_swallow) {
- /* Add sink_out dependencies for each cell that is part of
- * a pair/sub_pair task as to not miss any dependencies */
- if (ci_nodeID == nodeID)
- scheduler_activate(s, ci->hydro.super->sinks.sink_out);
- if (cj_nodeID == nodeID)
- scheduler_activate(s, cj->hydro.super->sinks.sink_out);
- }
-
- /* Store current values of dx_max and h_max. */
- else if (t_type == task_type_sub_pair &&
- t_subtype == task_subtype_sink_swallow) {
- cell_activate_subcell_sinks_tasks(ci, cj, s, with_timestep_sync);
- /* Activate sinks_in for each cell that is part of
- * a sub_pair task as to not miss any dependencies */
- if (ci_nodeID == nodeID)
- scheduler_activate(s, ci->hydro.super->sinks.sink_in);
- if (cj_nodeID == nodeID)
- scheduler_activate(s, cj->hydro.super->sinks.sink_in);
- }
- }
-
- /* RT gradient and transport tasks */
- else if (t_subtype == task_subtype_rt_gradient) {
-
- /* We only want to activate the task if the cell is active and is
- going to update some gas on the *local* node */
-
- if ((ci_nodeID == nodeID && ci_active_rt) ||
- (cj_nodeID == nodeID && cj_active_rt)) {
-
- scheduler_activate(s, t);
-
- /* Set the correct sorting flags */
- if (t_type == task_type_pair) {
-
- /* Store some values. */
- atomic_or(&ci->hydro.requires_sorts, 1 << t->flags);
- atomic_or(&cj->hydro.requires_sorts, 1 << t->flags);
- ci->hydro.dx_max_sort_old = ci->hydro.dx_max_sort;
- cj->hydro.dx_max_sort_old = cj->hydro.dx_max_sort;
-
- /* Check the sorts and activate them if needed. */
- cell_activate_rt_sorts(ci, t->flags, s);
- cell_activate_rt_sorts(cj, t->flags, s);
- }
-
- /* Store current values of dx_max and h_max. */
- else if (t_type == task_type_sub_pair) {
- cell_activate_subcell_rt_tasks(ci, cj, s, /*sub_cycle=*/0);
- }
- }
- }
-
- else if (t_subtype == task_subtype_rt_transport) {
- /* We only want to activate the task if the cell is active and is
- going to update some gas on the *local* node */
-
- if ((ci_nodeID == nodeID && ci_active_rt) ||
- (cj_nodeID == nodeID && cj_active_rt)) {
-
- /* The gradient and transport task subtypes mirror the hydro tasks.
- * Therefore all the (subcell) sorts and drifts should already have
- * been activated properly in the hydro part of the activation. */
- scheduler_activate(s, t);
-
- if (t_type == task_type_pair || t_type == task_type_sub_pair) {
- /* Activate transport_out for each cell that is part of
- * a pair/sub_pair task as to not miss any dependencies */
- if (ci_nodeID == nodeID)
- scheduler_activate(s, ci->hydro.super->rt.rt_transport_out);
- if (cj_nodeID == nodeID)
- scheduler_activate(s, cj->hydro.super->rt.rt_transport_out);
- }
- }
- }
-
- /* Pair tasks between inactive local cells and active remote cells. */
- if ((ci_nodeID != nodeID && cj_nodeID == nodeID && ci_active_hydro &&
- !cj_active_hydro) ||
- (ci_nodeID == nodeID && cj_nodeID != nodeID && !ci_active_hydro &&
- cj_active_hydro)) {
-
-#if defined(WITH_MPI) && defined(MPI_SYMMETRIC_FORCE_INTERACTION)
- if (t_subtype == task_subtype_force) {
-
- scheduler_activate(s, t);
-
- /* Set the correct sorting flags */
- if (t_type == task_type_pair) {
- /* Store some values. */
- atomic_or(&ci->hydro.requires_sorts, 1 << t->flags);
- atomic_or(&cj->hydro.requires_sorts, 1 << t->flags);
- ci->hydro.dx_max_sort_old = ci->hydro.dx_max_sort;
- cj->hydro.dx_max_sort_old = cj->hydro.dx_max_sort;
-
- /* Activate the hydro drift tasks. */
- if (ci_nodeID == nodeID) cell_activate_drift_part(ci, s);
- if (cj_nodeID == nodeID) cell_activate_drift_part(cj, s);
-
- /* And the limiter */
- if (ci_nodeID == nodeID && with_timestep_limiter)
- cell_activate_limiter(ci, s);
- if (cj_nodeID == nodeID && with_timestep_limiter)
- cell_activate_limiter(cj, s);
-
- /* Check the sorts and activate them if needed. */
- cell_activate_hydro_sorts(ci, t->flags, s);
- cell_activate_hydro_sorts(cj, t->flags, s);
-
- }
-
- /* Store current values of dx_max and h_max. */
- else if (t_type == task_type_sub_pair) {
- cell_activate_subcell_hydro_tasks(t->ci, t->cj, s,
- with_timestep_limiter);
- }
- }
-#endif
- }
-
- /* Pair tasks between inactive local cells and active remote cells. */
- if ((ci_nodeID != nodeID && cj_nodeID == nodeID && ci_active_rt &&
- !cj_active_rt) ||
- (ci_nodeID == nodeID && cj_nodeID != nodeID && !ci_active_rt &&
- cj_active_rt)) {
-
-#if defined(WITH_MPI) && defined(MPI_SYMMETRIC_FORCE_INTERACTION_RT)
- if (t_subtype == task_subtype_rt_transport) {
-
- scheduler_activate(s, t);
-
- /* Set the correct sorting flags */
- if (t_type == task_type_pair) {
-
- /* Store some values. */
- atomic_or(&ci->hydro.requires_sorts, 1 << t->flags);
- atomic_or(&cj->hydro.requires_sorts, 1 << t->flags);
- ci->hydro.dx_max_sort_old = ci->hydro.dx_max_sort;
- cj->hydro.dx_max_sort_old = cj->hydro.dx_max_sort;
-
- /* Check the sorts and activate them if needed. */
- cell_activate_rt_sorts(ci, t->flags, s);
- cell_activate_rt_sorts(cj, t->flags, s);
- }
-
- /* Store current values of dx_max and h_max. */
- else if (t_type == task_type_sub_pair) {
- cell_activate_subcell_rt_tasks(ci, cj, s, /*sub_cycle=*/0);
- }
- }
-#endif
- }
-
- /* Only interested in density tasks as of here. */
- if (t_subtype == task_subtype_density) {
-
- /* Too much particle movement? */
- if (cell_need_rebuild_for_hydro_pair(ci, cj)) *rebuild_space = 1;
-
-#ifdef WITH_MPI
- /* Activate the send/recv tasks. */
- if (ci_nodeID != nodeID) {
-
- /* If the local cell is active, receive data from the foreign cell. */
- if (cj_active_hydro) {
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_xv);
- if (ci_active_hydro) {
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_rho);
-#ifdef EXTRA_HYDRO_LOOP
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_gradient);
-#endif
- }
- }
- /* If the local cell is inactive and the remote cell is active, we
- * still need to receive stuff to be able to do the force interaction
- * on this node as well. */
- else if (ci_active_hydro) {
-#ifdef MPI_SYMMETRIC_FORCE_INTERACTION
- /* NOTE: (yuyttenh, 09/2022) Since the particle communications send
- * over whole particles currently, just activating the gradient
- * send/recieve should be enough for now. The remote active
- * particles are only needed for the sorts and the flux exchange on
- * the node of the inactive cell, so sending over the xv and
- * gradient suffices. If at any point the commutications change, we
- * should probably also send over the rho separately. */
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_xv);
-#ifndef EXTRA_HYDRO_LOOP
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_rho);
-#else
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_gradient);
-#endif
-#endif
- }
-
- /* If the foreign cell is active, we want its particles for the
- * limiter */
- if (ci_active_hydro && with_timestep_limiter) {
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_limiter);
- scheduler_activate_unpack(s, ci->mpi.unpack, task_subtype_limiter);
- }
-
- /* Is the foreign cell active and will need stuff from us? */
- if (ci_active_hydro) {
- scheduler_activate_send(s, cj->mpi.send, task_subtype_xv,
- ci_nodeID);
-
- /* Drift the cell which will be sent at the level at which it is
- sent, i.e. drift the cell specified in the send task (l->t)
- itself. */
- cell_activate_drift_part(cj, s);
- if (with_timestep_limiter) cell_activate_limiter(cj, s);
-
- /* If the local cell is also active, more stuff will be needed. */
- if (cj_active_hydro) {
- scheduler_activate_send(s, cj->mpi.send, task_subtype_rho,
- ci_nodeID);
-
-#ifdef EXTRA_HYDRO_LOOP
- scheduler_activate_send(s, cj->mpi.send, task_subtype_gradient,
- ci_nodeID);
-#endif
- }
- }
- /* If the foreign cell is inactive, but the local cell is active,
- * we still need to send stuff to be able to do the force interaction
- * on both nodes */
- else if (cj_active_hydro) {
-#ifdef MPI_SYMMETRIC_FORCE_INTERACTION
- /* See NOTE on line 867 */
- struct link *l = scheduler_activate_send(
- s, cj->mpi.send, task_subtype_xv, ci_nodeID);
- /* Drift the cell which will be sent at the level at which it is
- * sent, i.e. drift the cell specified in the send task (l->t)
- * itself. */
- cell_activate_drift_part(l->t->ci, s);
-#ifndef EXTRA_HYDRO_LOOP
- scheduler_activate_send(s, cj->mpi.send, task_subtype_rho,
- ci_nodeID);
-#else
- scheduler_activate_send(s, cj->mpi.send, task_subtype_gradient,
- ci_nodeID);
-#endif
-#endif
- }
-
- /* If the local cell is active, send its particles for the limiting.
- */
- if (cj_active_hydro && with_timestep_limiter) {
- scheduler_activate_send(s, cj->mpi.send, task_subtype_limiter,
- ci_nodeID);
- scheduler_activate_pack(s, cj->mpi.pack, task_subtype_limiter,
- ci_nodeID);
- }
-
- /* Propagating new star counts? */
- if (with_star_formation_sink) error("TODO");
- if (with_star_formation && with_feedback) {
- if (ci_active_hydro && ci->hydro.count > 0) {
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_sf_counts);
- }
- if (cj_active_hydro && cj->hydro.count > 0) {
- scheduler_activate_send(s, cj->mpi.send, task_subtype_sf_counts,
- ci_nodeID);
- }
- }
-
- } else if (cj_nodeID != nodeID) {
-
- /* If the local cell is active, receive data from the foreign cell. */
- if (ci_active_hydro) {
-
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_xv);
- if (cj_active_hydro) {
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_rho);
-#ifdef EXTRA_HYDRO_LOOP
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_gradient);
-#endif
- }
- }
- /* If the local cell is inactive and the remote cell is active, we
- * still need to receive stuff to be able to do the force interaction
- * on this node as well. */
- else if (cj_active_hydro) {
-#ifdef MPI_SYMMETRIC_FORCE_INTERACTION
- /* See NOTE on line 867. */
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_xv);
-#ifndef EXTRA_HYDRO_LOOP
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_rho);
-#else
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_gradient);
-#endif
-#endif
- }
-
- /* If the foreign cell is active, we want its particles for the
- * limiter */
- if (cj_active_hydro && with_timestep_limiter) {
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_limiter);
- scheduler_activate_unpack(s, cj->mpi.unpack, task_subtype_limiter);
- }
-
- /* Is the foreign cell active and will need stuff from us? */
- if (cj_active_hydro) {
-
- scheduler_activate_send(s, ci->mpi.send, task_subtype_xv,
- cj_nodeID);
-
- /* Drift the cell which will be sent at the level at which it is
- sent, i.e. drift the cell specified in the send task (l->t)
- itself. */
- cell_activate_drift_part(ci, s);
- if (with_timestep_limiter) cell_activate_limiter(ci, s);
-
- /* If the local cell is also active, more stuff will be needed. */
- if (ci_active_hydro) {
-
- scheduler_activate_send(s, ci->mpi.send, task_subtype_rho,
- cj_nodeID);
-
-#ifdef EXTRA_HYDRO_LOOP
- scheduler_activate_send(s, ci->mpi.send, task_subtype_gradient,
- cj_nodeID);
-#endif
- }
- }
- /* If the foreign cell is inactive, but the local cell is active,
- * we still need to send stuff to be able to do the force interaction
- * on both nodes */
- else if (ci_active_hydro) {
-#ifdef MPI_SYMMETRIC_FORCE_INTERACTION
- /* See NOTE on line 867. */
- struct link *l = scheduler_activate_send(
- s, ci->mpi.send, task_subtype_xv, cj_nodeID);
- /* Drift the cell which will be sent at the level at which it is
- * sent, i.e. drift the cell specified in the send task (l->t)
- * itself. */
- cell_activate_drift_part(l->t->ci, s);
-#ifndef EXTRA_HYDRO_LOOP
- scheduler_activate_send(s, ci->mpi.send, task_subtype_rho,
- cj_nodeID);
-#else
- scheduler_activate_send(s, ci->mpi.send, task_subtype_gradient,
- cj_nodeID);
-#endif
-#endif
- }
-
- /* If the local cell is active, send its particles for the limiting.
- */
- if (ci_active_hydro && with_timestep_limiter) {
- scheduler_activate_send(s, ci->mpi.send, task_subtype_limiter,
- cj_nodeID);
- scheduler_activate_pack(s, ci->mpi.pack, task_subtype_limiter,
- cj_nodeID);
- }
-
- /* Propagating new star counts? */
- if (with_star_formation_sink) error("TODO");
- if (with_star_formation && with_feedback) {
- if (cj_active_hydro && cj->hydro.count > 0) {
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_sf_counts);
- }
- if (ci_active_hydro && ci->hydro.count > 0) {
- scheduler_activate_send(s, ci->mpi.send, task_subtype_sf_counts,
- cj_nodeID);
- }
- }
- }
-#endif
- }
-
- /* Only interested in stars_density tasks as of here. */
- else if (t->subtype == task_subtype_stars_density) {
-
- /* Too much particle movement? */
- if (cell_need_rebuild_for_stars_pair(ci, cj)) *rebuild_space = 1;
- if (cell_need_rebuild_for_stars_pair(cj, ci)) *rebuild_space = 1;
-
-#ifdef WITH_MPI
- /* Activate the send/recv tasks. */
- if (ci_nodeID != nodeID) {
-
- if (cj_active_stars) {
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_xv);
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_rho);
-#ifdef EXTRA_STAR_LOOPS
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_part_prep1);
-#endif
-
- /* If the local cell is active, more stuff will be needed. */
- scheduler_activate_send(s, cj->mpi.send, task_subtype_spart_density,
- ci_nodeID);
-#ifdef EXTRA_STAR_LOOPS
- scheduler_activate_send(s, cj->mpi.send, task_subtype_spart_prep2,
- ci_nodeID);
-#endif
- cell_activate_drift_spart(cj, s);
- }
-
- if (ci_active_stars) {
- scheduler_activate_recv(s, ci->mpi.recv,
- task_subtype_spart_density);
-#ifdef EXTRA_STAR_LOOPS
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_spart_prep2);
-#endif
-
- /* Is the foreign cell active and will need stuff from us? */
- scheduler_activate_send(s, cj->mpi.send, task_subtype_xv,
- ci_nodeID);
- scheduler_activate_send(s, cj->mpi.send, task_subtype_rho,
- ci_nodeID);
-#ifdef EXTRA_STAR_LOOPS
- scheduler_activate_send(s, cj->mpi.send, task_subtype_part_prep1,
- ci_nodeID);
-#endif
-
- /* Drift the cell which will be sent; note that not all sent
- particles will be drifted, only those that are needed. */
- cell_activate_drift_part(cj, s);
- }
-
- } else if (cj_nodeID != nodeID) {
-
- /* If the local cell is active, receive data from the foreign cell. */
- if (ci_active_stars) {
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_xv);
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_rho);
-#ifdef EXTRA_STAR_LOOPS
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_part_prep1);
-#endif
-
- /* If the local cell is active, more stuff will be needed. */
- scheduler_activate_send(s, ci->mpi.send, task_subtype_spart_density,
- cj_nodeID);
-#ifdef EXTRA_STAR_LOOPS
- scheduler_activate_send(s, ci->mpi.send, task_subtype_spart_prep2,
- cj_nodeID);
-#endif
- cell_activate_drift_spart(ci, s);
- }
-
- if (cj_active_stars) {
- scheduler_activate_recv(s, cj->mpi.recv,
- task_subtype_spart_density);
-#ifdef EXTRA_STAR_LOOPS
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_spart_prep2);
-#endif
-
- /* Is the foreign cell active and will need stuff from us? */
- scheduler_activate_send(s, ci->mpi.send, task_subtype_xv,
- cj_nodeID);
- scheduler_activate_send(s, ci->mpi.send, task_subtype_rho,
- cj_nodeID);
-#ifdef EXTRA_STAR_LOOPS
- scheduler_activate_send(s, ci->mpi.send, task_subtype_part_prep1,
- cj_nodeID);
-#endif
-
- /* Drift the cell which will be sent; note that not all sent
- particles will be drifted, only those that are needed. */
- cell_activate_drift_part(ci, s);
- }
- }
-#endif
- }
-
- /* Only interested in sink_swallow tasks as of here. */
- else if (t->subtype == task_subtype_sink_swallow) {
-
- /* Too much particle movement? */
- if (cell_need_rebuild_for_sinks_pair(ci, cj)) *rebuild_space = 1;
- if (cell_need_rebuild_for_sinks_pair(cj, ci)) *rebuild_space = 1;
-
-#ifdef WITH_MPI
- error("TODO");
-#endif
- }
-
- /* Only interested in black hole density tasks as of here. */
- else if (t->subtype == task_subtype_bh_density) {
-
- /* Too much particle movement? */
- if (cell_need_rebuild_for_black_holes_pair(ci, cj)) *rebuild_space = 1;
- if (cell_need_rebuild_for_black_holes_pair(cj, ci)) *rebuild_space = 1;
-
- if (ci->hydro.super->black_holes.count > 0 && ci_active_black_holes)
- scheduler_activate(s, ci->hydro.super->black_holes.swallow_ghost_1);
- if (cj->hydro.super->black_holes.count > 0 && cj_active_black_holes)
- scheduler_activate(s, cj->hydro.super->black_holes.swallow_ghost_1);
-
-#ifdef WITH_MPI
- /* Activate the send/recv tasks. */
- if (ci_nodeID != nodeID) {
-
- if (ci_active_black_holes || cj_active_black_holes) {
- /* We must exchange the foreign BHs no matter the activity status */
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_bpart_rho);
- scheduler_activate_send(s, cj->mpi.send, task_subtype_bpart_rho,
- ci_nodeID);
-
- /* Drift before you send */
- if (cj->black_holes.count > 0) cell_activate_drift_bpart(cj, s);
- }
-
- if (cj_active_black_holes) {
-
- /* Receive the foreign parts to compute BH accretion rates and do
- * the swallowing */
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_rho);
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_part_swallow);
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_bpart_merger);
-
- /* Send the local BHs to tag the particles to do feedback */
- scheduler_activate_send(s, cj->mpi.send,
- task_subtype_bpart_feedback, ci_nodeID);
-
- /* Drift before you send */
- cell_activate_drift_bpart(cj, s);
- }
-
- if (ci_active_black_holes) {
-
- /* Receive the foreign BHs for feedback */
- scheduler_activate_recv(s, ci->mpi.recv,
- task_subtype_bpart_feedback);
-
- /* Send the local part information */
- scheduler_activate_send(s, cj->mpi.send, task_subtype_rho,
- ci_nodeID);
- scheduler_activate_send(s, cj->mpi.send, task_subtype_part_swallow,
- ci_nodeID);
- scheduler_activate_send(s, cj->mpi.send, task_subtype_bpart_merger,
- ci_nodeID);
-
- /* Drift the cell which will be sent; note that not all sent
- particles will be drifted, only those that are needed. */
- if (cj->hydro.count > 0) cell_activate_drift_part(cj, s);
- }
-
- } else if (cj_nodeID != nodeID) {
-
- if (ci_active_black_holes || cj_active_black_holes) {
- /* We must exchange the foreign BHs no matter the activity status */
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_bpart_rho);
- scheduler_activate_send(s, ci->mpi.send, task_subtype_bpart_rho,
- cj_nodeID);
-
- /* Drift before you send */
- if (ci->black_holes.count > 0) cell_activate_drift_bpart(ci, s);
- }
-
- if (ci_active_black_holes) {
-
- /* Receive the foreign parts to compute BH accretion rates and do
- * the swallowing */
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_rho);
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_part_swallow);
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_bpart_merger);
-
- /* Send the local BHs to do feedback */
- scheduler_activate_send(s, ci->mpi.send,
- task_subtype_bpart_feedback, cj_nodeID);
-
- /* Drift before you send */
- cell_activate_drift_bpart(ci, s);
- }
-
- if (cj_active_black_holes) {
-
- /* Receive the foreign BHs for feedback */
- scheduler_activate_recv(s, cj->mpi.recv,
- task_subtype_bpart_feedback);
-
- /* Send the local part information */
- scheduler_activate_send(s, ci->mpi.send, task_subtype_rho,
- cj_nodeID);
- scheduler_activate_send(s, ci->mpi.send, task_subtype_part_swallow,
- cj_nodeID);
- scheduler_activate_send(s, ci->mpi.send, task_subtype_bpart_merger,
- cj_nodeID);
-
- /* Drift the cell which will be sent; note that not all sent
- particles will be drifted, only those that are needed. */
- if (ci->hydro.count > 0) cell_activate_drift_part(ci, s);
- }
- }
-#endif
- }
-
- /* Only interested in gravity tasks as of here. */
- else if (t_subtype == task_subtype_grav) {
-
-#ifdef WITH_MPI
- /* Activate the send/recv tasks. */
- if (ci_nodeID != nodeID) {
- /* If the local cell is active, receive data from the foreign cell. */
- if (cj_active_gravity)
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_gpart);
-
- /* Is the foreign cell active and will need stuff from us? */
- if (ci_active_gravity) {
-
- scheduler_activate_send(s, cj->mpi.send, task_subtype_gpart,
- ci_nodeID);
-
- /* Drift the cell which will be sent at the level at which it is
- sent, i.e. drift the cell specified in the send task (l->t)
- itself. */
- cell_activate_drift_gpart(cj, s);
- }
-
- /* Propagating new star counts? */
- if (with_star_formation) {
- if (ci_active_gravity && ci->hydro.count > 0) {
- scheduler_activate_recv(s, ci->mpi.recv,
- task_subtype_grav_counts);
- }
- if (cj_active_gravity && cj->hydro.count > 0) {
- scheduler_activate_send(s, cj->mpi.send, task_subtype_grav_counts,
- ci_nodeID);
- }
- }
-
- } else if (cj_nodeID != nodeID) {
-
- /* If the local cell is active, receive data from the foreign cell. */
- if (ci_active_gravity)
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_gpart);
-
- /* Is the foreign cell active and will need stuff from us? */
- if (cj_active_gravity) {
-
- scheduler_activate_send(s, ci->mpi.send, task_subtype_gpart,
- cj_nodeID);
-
- /* Drift the cell which will be sent at the level at which it is
- sent, i.e. drift the cell specified in the send task (l->t)
- itself. */
- cell_activate_drift_gpart(ci, s);
- }
-
- /* Propagating new star counts? */
- if (with_star_formation) {
- if (cj_active_gravity && cj->hydro.count > 0) {
- scheduler_activate_recv(s, cj->mpi.recv,
- task_subtype_grav_counts);
- }
- if (ci_active_gravity && ci->hydro.count > 0) {
- scheduler_activate_send(s, ci->mpi.send, task_subtype_grav_counts,
- cj_nodeID);
- }
- }
- }
-#endif
- }
-
- /* Only interested in RT tasks as of here. */
- else if (t->subtype == task_subtype_rt_gradient) {
-
-#ifdef WITH_MPI
- /* Activate the send/recv tasks. */
- if (ci_nodeID != nodeID) {
-
- /* If the local cell is active, receive data from the foreign cell. */
- if (cj_active_rt) {
-
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_rt_gradient);
-
- if (ci_active_rt) {
- /* We only need updates later on if the other cell is active too
- */
- scheduler_activate_recv(s, ci->mpi.recv,
- task_subtype_rt_transport);
- }
- } else if (ci_active_rt) {
-#ifdef MPI_SYMMETRIC_FORCE_INTERACTION_RT
- /* If the local cell is inactive and the remote cell is active, we
- * still need to receive stuff to be able to do the force
- * interaction on this node as well. */
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_rt_gradient);
- scheduler_activate_recv(s, ci->mpi.recv, task_subtype_rt_transport);
-#endif
- }
-
- /* Is the foreign cell active and will need stuff from us? */
- if (ci_active_rt) {
-
- scheduler_activate_send(s, cj->mpi.send, task_subtype_rt_gradient,
- ci_nodeID);
-
- if (cj_active_rt) {
- scheduler_activate_send(s, cj->mpi.send,
- task_subtype_rt_transport, ci_nodeID);
- }
- } else if (cj_active_rt) {
-#ifdef MPI_SYMMETRIC_FORCE_INTERACTION_RT
- /* If the foreign cell is inactive, but the local cell is active,
- * we still need to send stuff to be able to do the force
- * interaction on both nodes */
- scheduler_activate_send(s, cj->mpi.send, task_subtype_rt_gradient,
- ci_nodeID);
- scheduler_activate_send(s, cj->mpi.send, task_subtype_rt_transport,
- ci_nodeID);
-#endif
- }
-
- } else if (cj_nodeID != nodeID) {
-
- /* If the local cell is active, receive data from the foreign cell. */
- if (ci_active_rt) {
-
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_rt_gradient);
-
- if (cj_active_rt) {
- /* We only need updates later on if the other cell is active too
- */
- scheduler_activate_recv(s, cj->mpi.recv,
- task_subtype_rt_transport);
- }
- } else if (cj_active_rt) {
-#ifdef MPI_SYMMETRIC_FORCE_INTERACTION_RT
- /* If the local cell is inactive and the remote cell is active, we
- * still need to receive stuff to be able to do the force
- * interaction on this node as well. */
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_rt_gradient);
- scheduler_activate_recv(s, cj->mpi.recv, task_subtype_rt_transport);
-#endif
- }
-
- /* Is the foreign cell active and will need stuff from us? */
- if (cj_active_rt) {
-
- scheduler_activate_send(s, ci->mpi.send, task_subtype_rt_gradient,
- cj_nodeID);
-
- if (ci_active_rt) {
- /* We only need updates later on if the other cell is active too
- */
- scheduler_activate_send(s, ci->mpi.send,
- task_subtype_rt_transport, cj_nodeID);
- }
- } else if (ci_active_rt) {
-#ifdef MPI_SYMMETRIC_FORCE_INTERACTION_RT
- /* If the foreign cell is inactive, but the local cell is active,
- * we still need to send stuff to be able to do the force
- * interaction on both nodes */
- scheduler_activate_send(s, ci->mpi.send, task_subtype_rt_gradient,
- cj_nodeID);
- scheduler_activate_send(s, ci->mpi.send, task_subtype_rt_transport,
- cj_nodeID);
-#endif
- }
- }
-#endif
- }
- }
-
- /* End force for hydro ? */
- else if (t_type == task_type_end_hydro_force) {
-
- if (cell_is_active_hydro(t->ci, e)) scheduler_activate(s, t);
- }
-
- /* End force for gravity ? */
- else if (t_type == task_type_end_grav_force) {
-
- if (cell_is_active_gravity(t->ci, e)) scheduler_activate(s, t);
- }
-
- /* Activate the weighting task for neutrinos */
- else if (t_type == task_type_neutrino_weight) {
- if (cell_is_active_gravity(t->ci, e)) {
- scheduler_activate(s, t);
- }
- }
-
- /* Kick ? */
- else if (t_type == task_type_kick1 || t_type == task_type_kick2) {
-
- if (cell_is_active_hydro(t->ci, e) || cell_is_active_gravity(t->ci, e) ||
- cell_is_active_stars(t->ci, e) || cell_is_active_sinks(t->ci, e) ||
- cell_is_active_black_holes(t->ci, e))
- scheduler_activate(s, t);
- }
-
- /* Hydro ghost tasks ? */
- else if (t_type == task_type_ghost || t_type == task_type_extra_ghost ||
- t_type == task_type_ghost_in || t_type == task_type_ghost_out) {
- if (cell_is_active_hydro(t->ci, e)) scheduler_activate(s, t);
- }
-
- /* csds tasks ? */
- else if (t->type == task_type_csds) {
- if (cell_is_active_hydro(t->ci, e) || cell_is_active_gravity(t->ci, e) ||
- cell_is_active_stars(t->ci, e))
- scheduler_activate(s, t);
- }
-
- /* Gravity stuff ? */
- else if (t_type == task_type_grav_down ||
- t_type == task_type_grav_long_range ||
- t_type == task_type_init_grav ||
- t_type == task_type_init_grav_out ||
- t_type == task_type_drift_gpart_out ||
- t_type == task_type_grav_down_in) {
- if (cell_is_active_gravity(t->ci, e)) scheduler_activate(s, t);
- }
-
- /* Multipole - Multipole interaction task */
- else if (t_type == task_type_grav_mm) {
-
- /* Local pointers. */
- const struct cell *ci = t->ci;
- const struct cell *cj = t->cj;
-#ifdef WITH_MPI
- const int ci_nodeID = ci->nodeID;
- const int cj_nodeID = (cj != NULL) ? cj->nodeID : -1;
-#else
- const int ci_nodeID = nodeID;
- const int cj_nodeID = nodeID;
-#endif
- const int ci_active_gravity = cell_is_active_gravity_mm(ci, e);
- const int cj_active_gravity = cell_is_active_gravity_mm(cj, e);
-
- if ((ci_active_gravity && ci_nodeID == nodeID) ||
- (cj_active_gravity && cj_nodeID == nodeID))
- scheduler_activate(s, t);
- }
-
- /* Star drift tasks? */
- else if (t_type == task_type_drift_spart) {
- if (cell_need_activating_stars(t->ci, e, with_star_formation,
- with_star_formation_sink))
- scheduler_activate(s, t);
-
- }
-
- /* Star ghost tasks ? */
- else if (t_type == task_type_stars_ghost ||
- t_type == task_type_stars_prep_ghost1 ||
- t_type == task_type_hydro_prep_ghost1 ||
- t_type == task_type_stars_prep_ghost2) {
- if (cell_need_activating_stars(t->ci, e, with_star_formation,
- with_star_formation_sink))
- scheduler_activate(s, t);
- }
-
- /* Feedback implicit tasks? */
- else if (t_type == task_type_stars_in || t_type == task_type_stars_out) {
- if (cell_need_activating_stars(t->ci, e, with_star_formation,
- with_star_formation_sink))
- scheduler_activate(s, t);
-
- }
-
- /* Sink implicit tasks? */
- else if (t_type == task_type_sink_in || t_type == task_type_sink_out ||
- t_type == task_type_sink_ghost1 ||
- t_type == task_type_sink_ghost2) {
- if (cell_is_active_sinks(t->ci, e) || cell_is_active_hydro(t->ci, e))
- scheduler_activate(s, t);
- }
-
- /* Black hole ghost tasks ? */
- else if (t_type == task_type_bh_density_ghost ||
- t_type == task_type_bh_swallow_ghost1 ||
- t_type == task_type_bh_swallow_ghost2 ||
- t_type == task_type_bh_swallow_ghost3) {
- if (cell_is_active_black_holes(t->ci, e)) {
-
- scheduler_activate(s, t);
- }
- }
-
- /* Black holes implicit tasks? */
- else if (t_type == task_type_bh_in || t_type == task_type_bh_out) {
- if (cell_is_active_black_holes(t->ci, e)) {
- scheduler_activate(s, t);
- }
- }
-
- /* Time-step collection? */
- else if (t_type == task_type_timestep) {
- t->ci->hydro.updated = 0;
- t->ci->grav.updated = 0;
- t->ci->stars.updated = 0;
- t->ci->sinks.updated = 0;
- t->ci->black_holes.updated = 0;
-
- if (!cell_is_empty(t->ci)) {
- if (cell_is_active_hydro(t->ci, e) ||
- cell_is_active_gravity(t->ci, e) ||
- cell_is_active_stars(t->ci, e) || cell_is_active_sinks(t->ci, e) ||
- cell_is_active_black_holes(t->ci, e))
- scheduler_activate(s, t);
- }
- }
-
- /* Time-step collection? */
- else if (t_type == task_type_collect) {
- t->ci->hydro.updated = 0;
- t->ci->grav.updated = 0;
- t->ci->stars.updated = 0;
- t->ci->sinks.updated = 0;
- t->ci->black_holes.updated = 0;
- t->ci->rt.updated = 0; /* this is different from time-step */
-
- if (!cell_is_empty(t->ci)) {
- if (cell_is_active_hydro(t->ci, e) ||
- cell_is_active_gravity(t->ci, e) ||
- cell_is_active_stars(t->ci, e) || cell_is_active_sinks(t->ci, e) ||
- cell_is_active_black_holes(t->ci, e) || cell_is_rt_active(t->ci, e))
- /* this is different from time-step ----^*/
- scheduler_activate(s, t);
- }
- }
-
- else if ((t_type == task_type_send && t_subtype == task_subtype_tend) ||
- (t_type == task_type_recv && t_subtype == task_subtype_tend)) {
- if (!cell_is_empty(t->ci)) {
- scheduler_activate(s, t);
- }
- }
-
- /* Subgrid tasks: cooling */
- else if (t_type == task_type_cooling || t_type == task_type_cooling_in ||
- t_type == task_type_cooling_out) {
- if (cell_is_active_hydro(t->ci, e)) scheduler_activate(s, t);
- }
-
- /* Subgrid tasks: star formation */
- else if (t_type == task_type_star_formation) {
- if (cell_is_active_hydro(t->ci, e)) {
- cell_activate_star_formation_tasks(t->ci, s, with_feedback);
- cell_activate_super_spart_drifts(t->ci, s);
- }
- }
-
- /* Subgrid tasks: star formation from sinks */
- else if (t_type == task_type_star_formation_sink) {
- if (cell_is_active_hydro(t->ci, e) || cell_is_active_sinks(t->ci, e)) {
- cell_activate_star_formation_sink_tasks(t->ci, s, with_feedback);
- cell_activate_super_sink_drifts(t->ci, s);
- }
- }
-
- /* Radiative transfer implicit tasks */
- else if (t->type == task_type_rt_in) {
- if (cell_is_rt_active(t->ci, e)) scheduler_activate(s, t);
- }
-
- else if (t->type == task_type_rt_ghost1 || t->type == task_type_rt_ghost2 ||
- t->type == task_type_rt_transport_out ||
- t->type == task_type_rt_tchem ||
- t->type == task_type_rt_advance_cell_time ||
- t->type == task_type_rt_out) {
- if (cell_is_rt_active(t->ci, e)) scheduler_activate(s, t);
- /* Note that rt_collect_times never needs to be active on main steps,
- * which is always what follows engine_marktasks().*/
- }
-
- /* Subgrid tasks: sink formation */
- else if (t_type == task_type_sink_formation) {
- if (with_star_formation_sink && t->ci->hydro.count > 0 &&
- cell_is_active_hydro(t->ci, e)) {
- cell_activate_sink_formation_tasks(t->ci, s);
- cell_activate_super_sink_drifts(t->ci, s);
- }
- }
- }
-}
-
-/**
- * @brief Mark tasks to be un-skipped and set the sort flags accordingly.
- *
- * @return 1 if the space has to be rebuilt, 0 otherwise.
- */
-int engine_marktasks(struct engine *e) {
-
-#ifdef SWIFT_DEBUG_CHECKS
-
- struct scheduler *s = &e->sched;
- const ticks tic = getticks();
- int rebuild_space = 0;
-
- /* Run through the tasks and mark as skip or not. */
- size_t extra_data[3] = {(size_t)e, (size_t)rebuild_space, (size_t)&e->sched};
- threadpool_map(&e->threadpool, engine_marktasks_mapper, s->tasks, s->nr_tasks,
- sizeof(struct task), threadpool_auto_chunk_size, extra_data);
- rebuild_space = extra_data[1];
-
- if (e->verbose)
- message("took %.3f %s.", clocks_from_ticks(getticks() - tic),
- clocks_getunit());
-
- /* All is well... */
- return rebuild_space;
-
-#else
- error("Marktasks has been deprecated. Only exists for debugging checks now!");
- return 0;
-#endif
-}
diff --git a/src/scheduler.c b/src/scheduler.c
index 8fa9c21d88eec50301f710ead73235e6c439759e..cfec9e728b428be8f71c99d59b4e825312ebe781 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -57,10 +57,6 @@
#include "timers.h"
#include "version.h"
-#ifdef SWIFT_DEBUG_CHECKS
-int activate_by_unskip = 1;
-#endif
-
/**
* @brief Re-set the list of active tasks.
*/
@@ -1740,10 +1736,6 @@ struct task *scheduler_addtask(struct scheduler *s, enum task_types type,
t->tic = 0;
t->toc = 0;
t->total_ticks = 0;
-#ifdef SWIFT_DEBUG_CHECKS
- t->activated_by_unskip = 0;
- t->activated_by_marktask = 0;
-#endif
if (ci != NULL) cell_set_flag(ci, cell_flag_has_tasks);
if (cj != NULL) cell_set_flag(cj, cell_flag_has_tasks);
diff --git a/src/scheduler.h b/src/scheduler.h
index 6ea7b41d58037ef4e86bb779d7910d74a9a41e9a..da7372c5eaec71ab2f18b4c7b9b07e11dec38778 100644
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -54,10 +54,6 @@
#define scheduler_flag_none 0
#define scheduler_flag_steal (1 << 1)
-#ifdef SWIFT_DEBUG_CHECKS
-extern int activate_by_unskip;
-#endif
-
/* Data of a scheduler. */
struct scheduler {
/* Scheduler flags. */
@@ -159,12 +155,6 @@ __attribute__((always_inline)) INLINE static void scheduler_activate(
int ind = atomic_inc(&s->active_count);
s->tid_active[ind] = t - s->tasks;
}
-#ifdef SWIFT_DEBUG_CHECKS
- if (activate_by_unskip)
- t->activated_by_unskip = 1;
- else
- t->activated_by_marktask = 1;
-#endif
}
/**
diff --git a/src/task.h b/src/task.h
index 828fd128f9e734e79cc51da4ef27d765b245e66c..b718326384d12bbcba69e5d8f901193f7ffa565c 100644
--- a/src/task.h
+++ b/src/task.h
@@ -293,12 +293,6 @@ struct task {
#ifdef SWIFT_DEBUG_CHECKS
/* When was this task last run? */
integertime_t ti_run;
-
- /* Was this task activted by unskip? */
- char activated_by_unskip;
-
- /* Was this task activted by marktask? */
- char activated_by_marktask;
#endif /* SWIFT_DEBUG_CHECKS */
} SWIFT_STRUCT_ALIGN;