From 838f353dcea8fbae33e5aedb6a70d8463cde9cba Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <schaller@strw.leidenuniv.nl>
Date: Thu, 9 May 2019 10:47:27 +0200
Subject: [PATCH] Documentation fixes. Removed debugging code.
---
src/active.h | 4 +-
src/cell.c | 186 ++++++++++-------------------
src/cell.h | 7 +-
src/engine.c | 32 ++---
src/engine_maketasks.c | 27 +++--
src/feedback/EAGLE/feedback_iact.h | 3 +-
src/runner.c | 108 +++++++++--------
src/runner_doiact_stars.h | 26 ++--
src/space.c | 27 ++---
src/stars/EAGLE/stars.h | 3 -
10 files changed, 187 insertions(+), 236 deletions(-)
diff --git a/src/active.h b/src/active.h
index 62ac122bf0..f15a98fcee 100644
--- a/src/active.h
+++ b/src/active.h
@@ -511,8 +511,8 @@ __attribute__((always_inline)) INLINE static int cell_is_starting_black_holes(
error(
"cell in an impossible time-zone! c->ti_beg_max=%lld (t=%e) and "
"e->ti_current=%lld (t=%e, a=%e)",
- c->black_holes.ti_beg_max, c->black_holes.ti_beg_max * e->time_base, e->ti_current,
- e->ti_current * e->time_base, e->cosmology->a);
+ c->black_holes.ti_beg_max, c->black_holes.ti_beg_max * e->time_base,
+ e->ti_current, e->ti_current * e->time_base, e->cosmology->a);
#endif
return (c->black_holes.ti_beg_max == e->ti_current);
diff --git a/src/cell.c b/src/cell.c
index 435dc33c7c..e50fe9e1b5 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -160,11 +160,6 @@ struct cell_split_pair cell_split_pairs[13] = {
{5, 6, 9},
{7, 6, 12}}}};
-extern int cell_to_check;
-extern int parent_cell_to_check;
-extern int super_cell_to_check;
-int CHECK = 0;
-
/**
* @brief Get the size of the cell subtree.
*
@@ -1078,7 +1073,7 @@ int cell_pack_sf_counts(struct cell *restrict c,
pcells[0].stars.delta_from_rebuild = c->stars.parts - c->stars.parts_rebuild;
pcells[0].stars.count = c->stars.count;
pcells[0].stars.dx_max_part = c->stars.dx_max_part;
-
+
#ifdef SWIFT_DEBUG_CHECKS
if (c->stars.parts_rebuild == NULL)
error("Star particles array at rebuild is NULL! c->depth=%d", c->depth);
@@ -2551,8 +2546,6 @@ void cell_activate_stars_sorts_up(struct cell *c, struct scheduler *s) {
if (c == c->hydro.super) {
- if(CHECK) message("in if");
-
#ifdef SWIFT_DEBUG_CHECKS
if (c->stars.sorts == NULL)
error("Trying to activate un-existing c->stars.sorts");
@@ -2562,31 +2555,17 @@ void cell_activate_stars_sorts_up(struct cell *c, struct scheduler *s) {
cell_activate_drift_spart(c, s);
}
} else {
- if(CHECK) message("in else");
-
- if(CHECK) {
-
- int sub_sort = cell_get_flag(c, cell_flag_do_stars_sub_sort);
- int parent_sub_sort = cell_get_flag(c->parent, cell_flag_do_stars_sub_sort);
-
- message("depth=%d cellID=%d sub_sort=%d parent->sub_sort=%d",
- c->depth, c->nodeID, sub_sort, parent_sub_sort);
- message("super->stars.sorts=%p", c->hydro.super->stars.sorts);
- message("super->stars.sorts->skip=%d", c->hydro.super->stars.sorts->skip);
- }
+ /* Climb up the tree and set the flags */
for (struct cell *parent = c->parent;
parent != NULL && !cell_get_flag(parent, cell_flag_do_stars_sub_sort);
parent = parent->parent) {
cell_set_flag(parent, cell_flag_do_stars_sub_sort);
- if(CHECK) message("parent->depth=%d", parent->depth);
+ /* Reached the super-level? Activate the task and abort */
if (parent == c->hydro.super) {
- if(CHECK) message("in other if");
-
-
#ifdef SWIFT_DEBUG_CHECKS
if (parent->stars.sorts == NULL)
error("Trying to activate un-existing parents->stars.sorts");
@@ -2604,15 +2583,9 @@ void cell_activate_stars_sorts_up(struct cell *c, struct scheduler *s) {
*/
void cell_activate_stars_sorts(struct cell *c, int sid, struct scheduler *s) {
- if(CHECK)
- message("Activating sorts for cell %d", c->cellID);
-
/* Do we need to re-sort? */
if (c->stars.dx_max_sort > space_maxreldx * c->dmin) {
- if(c->cellID == cell_to_check)
- message("In first if");
-
/* Climb up the tree to active the sorts in that direction */
for (struct cell *finger = c; finger != NULL; finger = finger->parent) {
if (finger->stars.requires_sorts) {
@@ -2625,10 +2598,6 @@ void cell_activate_stars_sorts(struct cell *c, int sid, struct scheduler *s) {
/* Has this cell been sorted at all for the given sid? */
if (!(c->stars.sorted & (1 << sid)) || c->nodeID != engine_rank) {
-
- if(CHECK)
- message("In second if");
-
atomic_or(&c->stars.do_sort, (1 << sid));
cell_activate_stars_sorts_up(c, s);
}
@@ -2788,9 +2757,9 @@ void cell_activate_subcell_stars_tasks(struct cell *ci, struct cell *cj,
else {
const int ci_active = cell_is_active_stars(ci, e) ||
- (with_star_formation && cell_is_active_hydro(ci, e));
+ (with_star_formation && cell_is_active_hydro(ci, e));
const int cj_active = cell_is_active_stars(cj, e) ||
- (with_star_formation && cell_is_active_hydro(cj, e));
+ (with_star_formation && cell_is_active_hydro(cj, e));
/* Should we even bother? */
if (!ci_active && !cj_active) return;
@@ -2798,41 +2767,11 @@ void cell_activate_subcell_stars_tasks(struct cell *ci, struct cell *cj,
/* Get the orientation of the pair. */
double shift[3];
const int sid = space_getsid(s->space, &ci, &cj, shift);
-
- /* if(e->nodeID == 7 && ci->cellID == super_cell_to_check) */
- /* message("Found the super ci! ci_active=%d cj_active=%d depth=%d", ci_active, cj_active, ci->depth); */
-
- /* if(e->nodeID == 7 && cj->cellID == super_cell_to_check) */
- /* message("Found the super cj! ci_active=%d cj_active=%d depth=%d", ci_active, cj_active, cj->depth); */
- /* if(e->nodeID == 7 && ci->depth > 0 && ci->parent->cellID == super_cell_to_check) */
- /* message("Found the parent ci! ci_active=%d cj_active=%d depth=%d", ci_active, cj_active, ci->depth); */
-
- /* if(e->nodeID == 7 && cj->depth > 0 &&cj->parent->cellID == super_cell_to_check) */
- /* message("Found the parent cj! ci_active=%d cj_active=%d depth=%d", ci_active, cj_active, cj->depth); */
-
- /* if(e->nodeID == 7 && cj->hydro.super->cellID == super_cell_to_check) */
- /* message("Found a cell with super-cell= %d depth=%d cellID=%d ci_active=%d cj_active=%d cj->requires_sorts=%d cj->do_sort=%d sid=%d cj->dx_max_part=%e cj->dx_max_part_old=%e cj->dx_max_sort=%e cj->dx_max_sort_old=%e", */
- /* cj->hydro.super->cellID, cj->depth, cj->cellID, ci_active, cj_active, cj->stars.requires_sorts, cj->stars.do_sort, sid, */
- /* cj->stars.dx_max_part, cj->stars.dx_max_part_old, */
- /* cj->stars.dx_max_sort, cj->stars.dx_max_sort_old); */
-
/* recurse? */
if (cell_can_recurse_in_pair_stars_task(ci, cj) &&
cell_can_recurse_in_pair_stars_task(cj, ci)) {
- /* if(e->nodeID == 7 && ci->cellID == super_cell_to_check) */
- /* message("Found the super ci! Recursing!"); */
-
- /* if(e->nodeID == 7 && cj->cellID == super_cell_to_check) */
- /* message("Found the super cj! Recursing!"); */
-
- /* if(e->nodeID == 7 && ci->depth > 0 && ci->parent->cellID == super_cell_to_check) */
- /* message("Found the parent ci! Recursing!"); */
-
- /* if(e->nodeID == 7 && cj->depth > 0 && cj->parent->cellID == super_cell_to_check) */
- /* message("Found the parent cj! Recursing!"); */
-
const struct cell_split_pair *csp = &cell_split_pairs[sid];
for (int k = 0; k < csp->count; k++) {
const int pid = csp->pairs[k].pid;
@@ -2847,14 +2786,7 @@ void cell_activate_subcell_stars_tasks(struct cell *ci, struct cell *cj,
else {
if (cell_is_active_stars(ci, e) ||
- (with_star_formation && cell_is_active_hydro(ci, e))) {
-
- /* if(e->nodeID == 7 && cj->hydro.super->cellID == super_cell_to_check && cj->depth==3) */
- /* message("ACTIVATING ci!!! Found a cell with super-cell= %d depth=%d cellID=%d ci_active=%d cj_active=%d cj->requires_sorts=%d cj->do_sort=%d sid=%d cj->dx_max_part=%e cj->dx_max_part_old=%e cj->dx_max_sort=%e cj->dx_max_sort_old=%e", */
- /* cj->hydro.super->cellID, cj->depth, cj->cellID, ci_active, cj_active, cj->stars.requires_sorts, cj->stars.do_sort, sid, */
- /* cj->stars.dx_max_part, cj->stars.dx_max_part_old, */
- /* cj->stars.dx_max_sort, cj->stars.dx_max_sort_old); */
-
+ (with_star_formation && cell_is_active_hydro(ci, e))) {
/* We are going to interact this pair, so store some values. */
atomic_or(&cj->hydro.requires_sorts, 1 << sid);
@@ -2873,17 +2805,7 @@ void cell_activate_subcell_stars_tasks(struct cell *ci, struct cell *cj,
}
if (cell_is_active_stars(cj, e) ||
- (with_star_formation && cell_is_active_hydro(cj, e))) {
-
- /* if(e->nodeID == 7 && cj->hydro.super->cellID == super_cell_to_check && cj->depth==3) { */
- /* message("ACTIVATING cj!!! Found a cell with super-cell= %d depth=%d cellID=%d ci_active=%d cj_active=%d cj->requires_sorts=%d cj->do_sort=%d sid=%d cj->dx_max_part=%e cj->dx_max_part_old=%e cj->dx_max_sort=%e cj->dx_max_sort_old=%e", */
- /* cj->hydro.super->cellID, cj->depth, cj->cellID, ci_active, cj_active, cj->stars.requires_sorts, cj->stars.do_sort, sid, */
- /* cj->stars.dx_max_part, cj->stars.dx_max_part_old, */
- /* cj->stars.dx_max_sort, cj->stars.dx_max_sort_old); */
-
- /* if(sid == 3) CHECK =1; */
- /* } */
-
+ (with_star_formation && cell_is_active_hydro(cj, e))) {
/* We are going to interact this pair, so store some values. */
atomic_or(&cj->stars.requires_sorts, 1 << sid);
@@ -2899,8 +2821,6 @@ void cell_activate_subcell_stars_tasks(struct cell *ci, struct cell *cj,
/* Do we need to sort the cells? */
cell_activate_hydro_sorts(ci, sid, s);
cell_activate_stars_sorts(cj, sid, s);
-
- CHECK = 0;
}
}
} /* Otherwise, pair interation */
@@ -3609,19 +3529,6 @@ int cell_unskip_stars_tasks(struct cell *c, struct scheduler *s,
(ci_nodeID == nodeID || cj_nodeID == nodeID)) {
scheduler_activate(s, t);
- if(ci->cellID == cell_to_check)
- message("Activating task ci case t->type=%s/%s", taskID_names[t->type], subtaskID_names[t->subtype]);
-
- if(cj != NULL && cj->cellID == cell_to_check)
- message("Activating task cj case t->type=%s/%s", taskID_names[t->type], subtaskID_names[t->subtype]);
-
-
- if(ci->cellID == super_cell_to_check)
- message("Activating super task ci case t->type=%s/%s", taskID_names[t->type], subtaskID_names[t->subtype]);
-
- if(cj != NULL && cj->cellID == super_cell_to_check)
- message("Activating super task cj case t->type=%s/%s", taskID_names[t->type], subtaskID_names[t->subtype]);
-
if (t->type == task_type_pair) {
/* Do ci */
if (ci_active) {
@@ -4832,24 +4739,33 @@ void cell_drift_multipole(struct cell *c, const struct engine *e) {
* @brief Resets all the sorting properties for the stars in a given cell
* hierarchy.
*
+ * The clear_unused_flags argument can be used to additionally clean up all
+ * the flags demanding a sort for the given cell. This should be used with
+ * caution as it will prevent the sort tasks from doing anything on that cell
+ * until these flags are reset.
+ *
* @param c The #cell to clean.
+ * @param clear_unused_flags Do we also clean the flags demanding a sort?
*/
-void cell_clear_stars_sort_flags(struct cell *c, const int clear_all) {
+void cell_clear_stars_sort_flags(struct cell *c, const int clear_unused_flags) {
- /* Indicate that the cell is not sorted and cancel the pointer sorting arrays.
- */
- if (clear_all) {
+ /* Clear the flags that have not been reset by the sort task? */
+ if (clear_unused_flags) {
c->stars.requires_sorts = 0;
c->stars.do_sort = 0;
cell_clear_flag(c, cell_flag_do_stars_sub_sort);
}
+
+ /* Indicate that the cell is not sorted and cancel the pointer sorting arrays.
+ */
c->stars.sorted = 0;
cell_free_stars_sorts(c);
/* Recurse if possible */
if (c->split) {
for (int k = 0; k < 8; k++)
- if (c->progeny[k] != NULL) cell_clear_stars_sort_flags(c->progeny[k], clear_all);
+ if (c->progeny[k] != NULL)
+ cell_clear_stars_sort_flags(c->progeny[k], clear_unused_flags);
}
}
@@ -4857,24 +4773,33 @@ void cell_clear_stars_sort_flags(struct cell *c, const int clear_all) {
* @brief Resets all the sorting properties for the hydro in a given cell
* hierarchy.
*
+ * The clear_unused_flags argument can be used to additionally clean up all
+ * the flags demanding a sort for the given cell. This should be used with
+ * caution as it will prevent the sort tasks from doing anything on that cell
+ * until these flags are reset.
+ *
* @param c The #cell to clean.
+ * @param clear_unused_flags Do we also clean the flags demanding a sort?
*/
-void cell_clear_hydro_sort_flags(struct cell *c, int clear_all) {
+void cell_clear_hydro_sort_flags(struct cell *c, const int clear_unused_flags) {
- /* Indicate that the cell is not sorted and cancel the pointer sorting arrays.
- */
- if (clear_all) {
+ /* Clear the flags that have not been reset by the sort task? */
+ if (clear_unused_flags) {
c->hydro.do_sort = 0;
c->hydro.requires_sorts = 0;
cell_clear_flag(c, cell_flag_do_hydro_sub_sort);
}
+
+ /* Indicate that the cell is not sorted and cancel the pointer sorting arrays.
+ */
c->hydro.sorted = 0;
cell_free_hydro_sorts(c);
/* Recurse if possible */
if (c->split) {
for (int k = 0; k < 8; k++)
- if (c->progeny[k] != NULL) cell_clear_hydro_sort_flags(c->progeny[k], clear_all);
+ if (c->progeny[k] != NULL)
+ cell_clear_hydro_sort_flags(c->progeny[k], clear_unused_flags);
}
}
@@ -4942,31 +4867,42 @@ void cell_check_spart_pos(const struct cell *c,
#endif
}
-void cell_check_sort_flags(const struct cell* c) {
+/**
+ * @brief Checks that a cell and all its progenies have cleared their sort
+ * flags.
+ *
+ * Should only be used for debugging purposes.
+ *
+ * @param c The #cell to check.
+ */
+void cell_check_sort_flags(const struct cell *c) {
#ifdef SWIFT_DEBUG_CHECKS
const int do_hydro_sub_sort = cell_get_flag(c, cell_flag_do_hydro_sub_sort);
const int do_stars_sub_sort = cell_get_flag(c, cell_flag_do_stars_sub_sort);
- if(do_hydro_sub_sort)
+ if (do_hydro_sub_sort)
error("cell %d has a hydro sub_sort flag set. Node=%d depth=%d maxdepth=%d",
c->cellID, c->nodeID, c->depth, c->maxdepth);
- if(do_stars_sub_sort) {
- message("cell %d has a stars sub_sort flag set. Node=%d depth=%d maxdepth=%d super=%p",
- c->cellID, c->nodeID, c->depth, c->maxdepth, c->hydro.super);
- message("c->stars.count=%d", c->stars.count);
- message("super->cellID=%d super->sorts=%p super->depth=%d", c->hydro.super->cellID,
-c->hydro.super->stars.sorts, c->hydro.super->depth);
- message("super->sorts->skip=%d",c->hydro.super->stars.sorts->skip);
+ if (do_stars_sub_sort) {
+ message(
+ "cell %d has a stars sub_sort flag set. Node=%d depth=%d maxdepth=%d "
+ "super=%p",
+ c->cellID, c->nodeID, c->depth, c->maxdepth, c->hydro.super);
+ message("c->stars.count=%d", c->stars.count);
+ message("super->cellID=%d super->sorts=%p super->depth=%d",
+ c->hydro.super->cellID, c->hydro.super->stars.sorts,
+ c->hydro.super->depth);
+ message("super->sorts->skip=%d", c->hydro.super->stars.sorts->skip);
- error("oooo");
-}
+ error("oooo");
+ }
- if(c->split) {
- for(int k = 0; k < 8; ++k) {
- if(c->progeny[k] != NULL) cell_check_sort_flags(c->progeny[k]);
- }
+ if (c->split) {
+ for (int k = 0; k < 8; ++k) {
+ if (c->progeny[k] != NULL) cell_check_sort_flags(c->progeny[k]);
+ }
}
#endif
}
diff --git a/src/cell.h b/src/cell.h
index 236fbbfc2b..6fcd073610 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -269,7 +269,7 @@ struct pcell_sf {
/*! Maximum part movement in this cell since last construction. */
float dx_max_part;
-
+
} stars;
};
@@ -883,8 +883,9 @@ void cell_clear_limiter_flags(struct cell *c, void *data);
void cell_set_super_mapper(void *map_data, int num_elements, void *extra_data);
void cell_check_spart_pos(const struct cell *c,
const struct spart *global_sparts);
-void cell_check_sort_flags(const struct cell* c);
-void cell_clear_stars_sort_flags(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);
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 0a21e3659f..65771f383c 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -4725,22 +4725,22 @@ void engine_dump_snapshot(struct engine *e) {
#endif
/* Dump... */
-/* #if defined(HAVE_HDF5) */
-/* #if defined(WITH_MPI) */
-/* #if defined(HAVE_PARALLEL_HDF5) */
-/* write_output_parallel(e, e->snapshot_base_name, e->internal_units, */
-/* e->snapshot_units, e->nodeID, e->nr_nodes, */
-/* MPI_COMM_WORLD, MPI_INFO_NULL); */
-/* #else */
-/* write_output_serial(e, e->snapshot_base_name, e->internal_units, */
-/* e->snapshot_units, e->nodeID, e->nr_nodes, MPI_COMM_WORLD, */
-/* MPI_INFO_NULL); */
-/* #endif */
-/* #else */
-/* write_output_single(e, e->snapshot_base_name, e->internal_units, */
-/* e->snapshot_units); */
-/* #endif */
-/* #endif */
+#if defined(HAVE_HDF5)
+#if defined(WITH_MPI)
+#if defined(HAVE_PARALLEL_HDF5)
+ write_output_parallel(e, e->snapshot_base_name, e->internal_units,
+ e->snapshot_units, e->nodeID, e->nr_nodes,
+ MPI_COMM_WORLD, MPI_INFO_NULL);
+#else
+ write_output_serial(e, e->snapshot_base_name, e->internal_units,
+ e->snapshot_units, e->nodeID, e->nr_nodes, MPI_COMM_WORLD,
+ MPI_INFO_NULL);
+#endif
+#else
+ write_output_single(e, e->snapshot_base_name, e->internal_units,
+ e->snapshot_units);
+#endif
+#endif
/* Flag that we dumped a snapshot */
e->step_props |= engine_step_prop_snapshot;
diff --git a/src/engine_maketasks.c b/src/engine_maketasks.c
index bbfb6bd2b7..92c8ce665e 100644
--- a/src/engine_maketasks.c
+++ b/src/engine_maketasks.c
@@ -249,15 +249,17 @@ void engine_addtasks_send_stars(struct engine *e, struct cell *ci,
if (t_sf_counts == NULL && with_star_formation && ci->hydro.count > 0) {
#ifdef SWIFT_DEBUG_CHECKS
- if(ci->depth != 0)
- error("Attaching a sf_count task at a non-top level c->depth=%d c->count=%d",
- ci->depth, ci->hydro.count);
+ if (ci->depth != 0)
+ error(
+ "Attaching a sf_count task at a non-top level c->depth=%d "
+ "c->count=%d",
+ ci->depth, ci->hydro.count);
#endif
- t_sf_counts = scheduler_addtask(s, task_type_send, task_subtype_sf_counts, ci->mpi.tag, 0, ci, cj);
+ t_sf_counts = scheduler_addtask(s, task_type_send, task_subtype_sf_counts,
+ ci->mpi.tag, 0, ci, cj);
scheduler_addunlock(s, ci->hydro.star_formation, t_sf_counts);
}
-
/* Check if any of the density tasks are for the target node. */
for (l = ci->stars.density; l != NULL; l = l->next)
if (l->t->ci->nodeID == nodeID ||
@@ -292,7 +294,6 @@ void engine_addtasks_send_stars(struct engine *e, struct cell *ci,
/* Update the stars counts before you send them */
if (with_star_formation && ci->hydro.count > 0) {
-
}
}
@@ -300,7 +301,7 @@ void engine_addtasks_send_stars(struct engine *e, struct cell *ci,
engine_addlink(e, &ci->mpi.send, t_ti);
if (with_star_formation && ci->hydro.count > 0) {
engine_addlink(e, &ci->mpi.send, t_sf_counts);
- }
+ }
}
/* Recurse? */
@@ -496,14 +497,16 @@ void engine_addtasks_recv_stars(struct engine *e, struct cell *c,
if (t_sf_counts == NULL && with_star_formation && c->hydro.count > 0) {
#ifdef SWIFT_DEBUG_CHECKS
- if(c->depth != 0)
- error("Attaching a sf_count task at a non-top level c->depth=%d c->count=%d",
- c->depth, c->hydro.count);
+ if (c->depth != 0)
+ error(
+ "Attaching a sf_count task at a non-top level c->depth=%d "
+ "c->count=%d",
+ c->depth, c->hydro.count);
#endif
t_sf_counts = scheduler_addtask(s, task_type_recv, task_subtype_sf_counts,
- c->mpi.tag, 0, c, NULL);
+ c->mpi.tag, 0, c, NULL);
}
-
+
/* Have we reached a level where there are any stars tasks ? */
if (t_feedback == NULL && c->stars.density != NULL) {
diff --git a/src/feedback/EAGLE/feedback_iact.h b/src/feedback/EAGLE/feedback_iact.h
index 5b707cbfd2..79906a83df 100644
--- a/src/feedback/EAGLE/feedback_iact.h
+++ b/src/feedback/EAGLE/feedback_iact.h
@@ -116,7 +116,8 @@ runner_iact_nonsym_feedback_apply(const float r2, const float *dx,
#ifdef SWIFT_DEBUG_CHECKS
if (Omega_frac < 0. || Omega_frac > 1.)
- error("Invalid fraction of material to dsitribute. Omega_frac=%e", Omega_frac);
+ error("Invalid fraction of material to dsitribute. Omega_frac=%e",
+ Omega_frac);
#endif
/* Update particle mass */
diff --git a/src/runner.c b/src/runner.c
index a39a677025..2ac64bf29a 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -1104,8 +1104,7 @@ void runner_do_star_formation(struct runner *r, struct cell *c, int timer) {
/* Did we get a star? (Or did we run out of spare ones?) */
if (sp != NULL) {
- message("We formed a star id=%lld cellID=%d", sp->id,
- c->cellID);
+ message("We formed a star id=%lld cellID=%d", sp->id, c->cellID);
/* Copy the properties of the gas particle to the star particle */
star_formation_copy_properties(p, xp, sp, e, sf_props, cosmo,
@@ -1316,19 +1315,20 @@ void runner_do_hydro_sort(struct runner *r, struct cell *c, int flags,
float dx_max_sort_old = 0.0f;
for (int k = 0; k < 8; k++) {
if (c->progeny[k] != NULL) {
-
- if( c->progeny[k]->hydro.count > 0) {
- /* Only propagate cleanup if the progeny is stale. */
- runner_do_hydro_sort(r, c->progeny[k], flags,
- cleanup && (c->progeny[k]->hydro.dx_max_sort_old >
- space_maxreldx * c->progeny[k]->dmin),
- 0);
- dx_max_sort = max(dx_max_sort, c->progeny[k]->hydro.dx_max_sort);
- dx_max_sort_old =
- max(dx_max_sort_old, c->progeny[k]->hydro.dx_max_sort_old);
- } else {
- cell_clear_hydro_sort_flags(c->progeny[k], 1);
- }
+
+ if (c->progeny[k]->hydro.count > 0) {
+ /* Only propagate cleanup if the progeny is stale. */
+ runner_do_hydro_sort(
+ r, c->progeny[k], flags,
+ cleanup && (c->progeny[k]->hydro.dx_max_sort_old >
+ space_maxreldx * c->progeny[k]->dmin),
+ 0);
+ dx_max_sort = max(dx_max_sort, c->progeny[k]->hydro.dx_max_sort);
+ dx_max_sort_old =
+ max(dx_max_sort_old, c->progeny[k]->hydro.dx_max_sort_old);
+ } else {
+ cell_clear_hydro_sort_flags(c->progeny[k], 1);
+ }
}
}
c->hydro.dx_max_sort = dx_max_sort;
@@ -1503,14 +1503,15 @@ void runner_do_stars_sort(struct runner *r, struct cell *c, int flags,
if (c->hydro.super == NULL) error("Task called above the super level!!!");
#endif
- if(c->cellID == cell_to_check) {
- message("Sorting stars in cellID=%d count=%d is_super=%d super=%d", c->cellID,
- c->stars.count, c == c->hydro.super, c->hydro.super->cellID);
+ if (c->cellID == cell_to_check) {
+ message("Sorting stars in cellID=%d count=%d is_super=%d super=%d",
+ c->cellID, c->stars.count, c == c->hydro.super,
+ c->hydro.super->cellID);
}
- if(c->cellID == super_cell_to_check) {
+ if (c->cellID == super_cell_to_check) {
message("Sorting stars in cellID=%d count=%d is_super=%d", c->cellID,
- c->stars.count, c == c->hydro.super);
+ c->stars.count, c == c->hydro.super);
}
/* We need to do the local sorts plus whatever was requested further up. */
@@ -1553,19 +1554,19 @@ void runner_do_stars_sort(struct runner *r, struct cell *c, int flags,
float dx_max_sort = 0.0f;
float dx_max_sort_old = 0.0f;
for (int k = 0; k < 8; k++) {
- if (c->progeny[k] != NULL){
- if(c->progeny[k]->stars.count > 0) {
- /* Only propagate cleanup if the progeny is stale. */
- const int cleanup_prog =
- cleanup && (c->progeny[k]->stars.dx_max_sort_old >
- space_maxreldx * c->progeny[k]->dmin);
- runner_do_stars_sort(r, c->progeny[k], flags, cleanup_prog, 0);
- dx_max_sort = max(dx_max_sort, c->progeny[k]->stars.dx_max_sort);
- dx_max_sort_old =
- max(dx_max_sort_old, c->progeny[k]->stars.dx_max_sort_old);
- } else {
- cell_clear_stars_sort_flags(c->progeny[k], 1);
- }
+ if (c->progeny[k] != NULL) {
+ if (c->progeny[k]->stars.count > 0) {
+ /* Only propagate cleanup if the progeny is stale. */
+ const int cleanup_prog =
+ cleanup && (c->progeny[k]->stars.dx_max_sort_old >
+ space_maxreldx * c->progeny[k]->dmin);
+ runner_do_stars_sort(r, c->progeny[k], flags, cleanup_prog, 0);
+ dx_max_sort = max(dx_max_sort, c->progeny[k]->stars.dx_max_sort);
+ dx_max_sort_old =
+ max(dx_max_sort_old, c->progeny[k]->stars.dx_max_sort_old);
+ } else {
+ cell_clear_stars_sort_flags(c->progeny[k], 1);
+ }
}
}
c->stars.dx_max_sort = dx_max_sort;
@@ -1647,8 +1648,8 @@ void runner_do_stars_sort(struct runner *r, struct cell *c, int flags,
/* And the individual sort distances if we are a local cell */
for (int k = 0; k < count; k++) {
- if(sparts[k].id == 155966626889L)
- message("Sorting star %lld", sparts[k].id);
+ if (sparts[k].id == 155966626889L)
+ message("Sorting star %lld", sparts[k].id);
sparts[k].x_diff_sort[0] = 0.0f;
sparts[k].x_diff_sort[1] = 0.0f;
sparts[k].x_diff_sort[2] = 0.0f;
@@ -2377,8 +2378,8 @@ static void runner_do_unskip_hydro(struct cell *c, struct engine *e) {
static void runner_do_unskip_stars(struct cell *c, struct engine *e,
const int with_star_formation) {
- const int non_empty = c->stars.count > 0 ||
- (with_star_formation && c->hydro.count > 0);
+ const int non_empty =
+ c->stars.count > 0 || (with_star_formation && c->hydro.count > 0);
/* Ignore empty cells. */
if (!non_empty) return;
@@ -3148,8 +3149,8 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) {
/* Get a handle on the part. */
struct spart *restrict sp = &sparts[k];
- if(sp->id == 155966626889L)
- message("getting time-step for spart id=%lld", sp->id);
+ if (sp->id == 155966626889L)
+ message("getting time-step for spart id=%lld", sp->id);
/* need to be updated ? */
if (spart_is_active(sp, e)) {
@@ -3169,10 +3170,10 @@ void runner_do_timestep(struct runner *r, struct cell *c, int timer) {
sp->time_bin = get_time_bin(ti_new_step);
sp->gpart->time_bin = get_time_bin(ti_new_step);
- if(sp->id == 155966626889L)
- message("new time-step for spart id=%lld is %d", sp->id,
- sp->time_bin);
-
+ if (sp->id == 155966626889L)
+ message("new time-step for spart id=%lld is %d", sp->id,
+ sp->time_bin);
+
/* Number of updated s-particles */
s_updated++;
g_updated++;
@@ -3857,16 +3858,17 @@ void runner_do_recv_spart(struct runner *r, struct cell *c, int clear_sorts,
time_bin_max = max(time_bin_max, sparts[k].time_bin);
h_max = max(h_max, sparts[k].h);
- if(sparts[k].id == 155966626889L) {
- message("Received star %lld", sparts[k].id);
- cell_to_check = c->cellID;
- parent_cell_to_check = c->parent->cellID;
- super_cell_to_check = c->hydro.super->cellID;
- message("Cell to check: %d depth=%d", cell_to_check, c->depth);
- message("Parent cell to check: %d", parent_cell_to_check);
- message("Super to check: %d", super_cell_to_check);
- message("Super to check sort task: %p", c->hydro.super->stars.sorts);
- message("Super to check sort task skip: %d", c->hydro.super->stars.sorts->skip);
+ if (sparts[k].id == 155966626889L) {
+ message("Received star %lld", sparts[k].id);
+ cell_to_check = c->cellID;
+ parent_cell_to_check = c->parent->cellID;
+ super_cell_to_check = c->hydro.super->cellID;
+ message("Cell to check: %d depth=%d", cell_to_check, c->depth);
+ message("Parent cell to check: %d", parent_cell_to_check);
+ message("Super to check: %d", super_cell_to_check);
+ message("Super to check sort task: %p", c->hydro.super->stars.sorts);
+ message("Super to check sort task skip: %d",
+ c->hydro.super->stars.sorts->skip);
}
}
diff --git a/src/runner_doiact_stars.h b/src/runner_doiact_stars.h
index 822f57a184..2518571656 100644
--- a/src/runner_doiact_stars.h
+++ b/src/runner_doiact_stars.h
@@ -1308,8 +1308,12 @@ void DOSUB_PAIR1_STARS(struct runner *r, struct cell *ci, struct cell *cj,
/* Do any of the cells need to be sorted first? */
if (!(ci->stars.sorted & (1 << sid)) ||
ci->stars.dx_max_sort_old > ci->dmin * space_maxreldx) {
- error("Interacting unsorted cell (sparts). ci->nodeID=%d ci->stars.count=%d ci->stars[0].id=%lld ci->cellID=%d ci->super->cellID=%d",
- ci->nodeID, ci->stars.count, ci->stars.parts[0].id, ci->cellID, ci->hydro.super->cellID);
+ error(
+ "Interacting unsorted cell (sparts). ci->nodeID=%d "
+ "ci->stars.count=%d ci->stars[0].id=%lld ci->cellID=%d "
+ "ci->super->cellID=%d",
+ ci->nodeID, ci->stars.count, ci->stars.parts[0].id, ci->cellID,
+ ci->hydro.super->cellID);
}
if (!(cj->hydro.sorted & (1 << sid)) ||
@@ -1334,11 +1338,19 @@ void DOSUB_PAIR1_STARS(struct runner *r, struct cell *ci, struct cell *cj,
if (!(cj->stars.sorted & (1 << sid)) ||
cj->stars.dx_max_sort_old > cj->dmin * space_maxreldx) {
- error("Interacting unsorted cell (sparts). cj->nodeID=%d cj->stars.count=%d cj->stars[0].id=%lld cj->cellID=%d cj->parent->cellID=%d cj->super->cellID=%d stars.ti_end_min=%lld ti_current=%lld cj->depth=%d cj->super->depth=%d cj->requires_sorts=%d cj->do_sort=%d sid=%d dx_max_part=%e dx_max_part_old=%e dx_max_sort=%e dx_max_sort_old=%e",
- cj->nodeID, cj->stars.count, cj->stars.parts[0].id, cj->cellID, cj->parent->cellID, cj->hydro.super->cellID, cj->stars.ti_end_min,
- e->ti_current, cj->depth, cj->hydro.super->depth, cj->stars.requires_sorts, cj->stars.do_sort, sid,
- cj->stars.dx_max_part, cj->stars.dx_max_part_old,
- cj->stars.dx_max_sort, cj->stars.dx_max_sort_old);
+ error(
+ "Interacting unsorted cell (sparts). cj->nodeID=%d "
+ "cj->stars.count=%d cj->stars[0].id=%lld cj->cellID=%d "
+ "cj->parent->cellID=%d cj->super->cellID=%d stars.ti_end_min=%lld "
+ "ti_current=%lld cj->depth=%d cj->super->depth=%d "
+ "cj->requires_sorts=%d cj->do_sort=%d sid=%d dx_max_part=%e "
+ "dx_max_part_old=%e dx_max_sort=%e dx_max_sort_old=%e",
+ cj->nodeID, cj->stars.count, cj->stars.parts[0].id, cj->cellID,
+ cj->parent->cellID, cj->hydro.super->cellID, cj->stars.ti_end_min,
+ e->ti_current, cj->depth, cj->hydro.super->depth,
+ cj->stars.requires_sorts, cj->stars.do_sort, sid,
+ cj->stars.dx_max_part, cj->stars.dx_max_part_old,
+ cj->stars.dx_max_sort, cj->stars.dx_max_sort_old);
}
}
diff --git a/src/space.c b/src/space.c
index b5765a01e7..1c5023c3b7 100644
--- a/src/space.c
+++ b/src/space.c
@@ -5193,19 +5193,19 @@ void space_check_limiter(struct space *s) {
}
void space_check_sort_flags_mapper(void *map_data, int nr_cells,
- void *extra_data) {
-
+ void *extra_data) {
+
#ifdef SWIFT_DEBUG_CHECKS
-
-const struct space *s = (struct space*) extra_data;
- int *local_cells_top = map_data;
- for(int ind = 0; ind < nr_cells; ++ind) {
- const struct cell *c = &s->cells_top[local_cells_top[ind]];
+ const struct space *s = (struct space *)extra_data;
+ int *local_cells_top = map_data;
+
+ for (int ind = 0; ind < nr_cells; ++ind) {
+ const struct cell *c = &s->cells_top[local_cells_top[ind]];
+
+ cell_check_sort_flags(c);
+ }
- cell_check_sort_flags(c);
-}
-
#endif
}
@@ -5219,10 +5219,9 @@ const struct space *s = (struct space*) extra_data;
void space_check_sort_flags(struct space *s) {
#ifdef SWIFT_DEBUG_CHECKS
- threadpool_map(&s->e->threadpool, space_check_sort_flags_mapper,
- s->local_cells_with_tasks_top,
- s->nr_local_cells_with_tasks,
- sizeof(int), 1, s);
+ threadpool_map(&s->e->threadpool, space_check_sort_flags_mapper,
+ s->local_cells_with_tasks_top, s->nr_local_cells_with_tasks,
+ sizeof(int), 1, s);
#else
error("Calling debugging code without debugging flag activated.");
#endif
diff --git a/src/stars/EAGLE/stars.h b/src/stars/EAGLE/stars.h
index 1a8564463c..09926d6a8b 100644
--- a/src/stars/EAGLE/stars.h
+++ b/src/stars/EAGLE/stars.h
@@ -46,9 +46,6 @@ __attribute__((always_inline)) INLINE static void stars_init_spart(
sp->num_ngb_density = 0;
#endif
- if(sp->id == 155966626889L)
- message("Initialising spart id=%lld", sp->id);
-
sp->density.wcount = 0.f;
sp->density.wcount_dh = 0.f;
}
--
GitLab