Move the clearing of the star sort properties to the cell.c file.

src/cell.c

@@ -4101,6 +4101,42 @@ void cell_drift_multipole(struct cell *c, const struct engine *e) {
   c->grav.ti_old_multipole = ti_current;
 }
 
+/**
+ * @brief Resets all the sorting properties for the stars in a given cell
+ * hierarchy.
+ *
+ * @param c The #cell to clean.
+ * @param is_super Is this a super-cell?
+ */
+void cell_clear_stars_sort_flags(struct cell *c, const int is_super) {
+
+  /* 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], /*is_super=*/0);
+  }
+
+  /* Free the sorted array at the level where it was allocated */
+  if (is_super) {
+
+#ifdef SWIFT_DEBUG_CHECKS
+    if (c != c->hydro.super) error("Cell is not a super-cell!!!");
+#endif
+
+    for (int i = 0; i < 13; i++) {
+      free(c->stars.sort[i]);
+    }
+  }
+
+  /* Indicate that the cell is not sorted and cancel the pointer sorting arrays.
+   */
+  c->stars.sorted = 0;
+  for (int i = 0; i < 13; i++) {
+    c->stars.sort[i] = NULL;
+  }
+}
+
 /**
  * @brief Recursively checks that all particles in a cell have a time-step
  */

src/cell.h

@@ -743,6 +743,7 @@ 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_clear_stars_sort_flags(struct cell *c, const int is_super);
 int cell_has_tasks(struct cell *c);
 void cell_remove_part(const struct engine *e, struct cell *c, struct part *p,
                       struct xpart *xp);

src/runner.c

@@ -483,31 +483,10 @@ void runner_do_cooling(struct runner *r, struct cell *c, int timer) {
   if (timer) TIMER_TOC(timer_do_cooling);
 }
 
-void runner_clear_stars_sort_flags(struct runner *r, struct cell *c) {
-
-  if (c->split) {
-    for (int k = 0; k < 8; k++)
-      if (c->progeny[k] != NULL)
-        runner_clear_stars_sort_flags(r, c->progeny[k]);
-  }
-
-  c->stars.sorted = 0;
-  for (int i = 0; i < 13; i++) {
-    c->stars.sort[i] = NULL;
-  }
-
-  if (c->hydro.super == c) {
-    for (int i = 0; i < 13; i++) {
-      free(c->stars.sort[i]);
-    }
-  }
-}
-
 /**
  *
  */
-void runner_do_star_formation(struct runner *r, struct cell *c, int timer,
-                              int *formed_stars) {
+void runner_do_star_formation(struct runner *r, struct cell *c, int timer) {
 
   struct engine *e = r->e;
   const struct cosmology *cosmo = e->cosmology;
@@ -522,6 +501,7 @@ void runner_do_star_formation(struct runner *r, struct cell *c, int timer,
   struct cooling_function_data *restrict cooling = e->cooling_func;
   const double time_base = e->time_base;
   const integertime_t ti_current = e->ti_current;
+  const int current_stars_count = c->stars.count;
 
   TIMER_TIC;
 
@@ -531,8 +511,7 @@ void runner_do_star_formation(struct runner *r, struct cell *c, int timer,
   /* Recurse? */
   if (c->split) {
     for (int k = 0; k < 8; k++)
-      if (c->progeny[k] != NULL)
-        runner_do_star_formation(r, c->progeny[k], 0, formed_stars);
+      if (c->progeny[k] != NULL) runner_do_star_formation(r, c->progeny[k], 0);
   } else {
 
     /* Loop over the gas particles in this cell. */
@@ -582,8 +561,6 @@ void runner_do_star_formation(struct runner *r, struct cell *c, int timer,
                 "STAR FORMED!!!! c->ID=%d super->ID=%d c->depth=%d"
                 "c->maxdepth=%d",
                 c->cellID, c->super->cellID, c->depth, c->maxdepth);
-
-            (*formed_stars)++;
           }
 
         } else { /* Are we not star-forming? */
@@ -597,16 +574,13 @@ void runner_do_star_formation(struct runner *r, struct cell *c, int timer,
     }     /* Loop over particles */
   }
 
-  if (timer && *formed_stars > 0) {
+  if ((c == c->hydro.super) && (current_stars_count != c->stars.count)) {
     message(
         "Emergency sort! c->ID=%d c->depth=%d c->maxdepth=%d c=%p c->super=%p",
         c->cellID, c->depth, c->maxdepth, c, c->hydro.super);
 
-    runner_clear_stars_sort_flags(r, c);
-
-    emergency_sort = 0;
-    runner_do_stars_sort(r, c, 0x1FFF, 1, 0);
-    emergency_sort = 0;
+    cell_clear_stars_sort_flags(c, /*is_super=*/1);
+    runner_do_stars_sort(r, c, 0x1FFF, /*cleanup=*/0, /*timer=*/0);
   }
 
   if (timer) TIMER_TOC(timer_do_star_formation);
@@ -991,8 +965,6 @@ void runner_do_stars_sort(struct runner *r, struct cell *c, int flags,
   if (c->stars.sorted == 0) c->stars.ti_sort = r->e->ti_current;
 #endif
 
-  if (emergency_sort) message("flag=%d", flags);
-
   /* start by allocating the entry arrays in the requested dimensions. */
   for (int j = 0; j < 13; j++) {
     if ((flags & (1 << j)) && c->stars.sort[j] == NULL) {
@@ -1023,10 +995,6 @@ void runner_do_stars_sort(struct runner *r, struct cell *c, int flags,
     c->stars.dx_max_sort = dx_max_sort;
     c->stars.dx_max_sort_old = dx_max_sort_old;
 
-    if (emergency_sort) {
-      message("c->id=%d (split) sorting", c->cellID);
-    }
-
     /* Loop over the 13 different sort arrays. */
     for (int j = 0; j < 13; j++) {
 
@@ -1098,13 +1066,6 @@ void runner_do_stars_sort(struct runner *r, struct cell *c, int flags,
   /* Otherwise, just sort. */
   else {
 
-    if (emergency_sort) {
-      message("c->id=%d (leaf) sorting", c->cellID);
-      /* for (int j = 0; j < 13; j++) */
-      /* 	if (flags & (1 << j)) */
-      /* 	  message("Sorting direction %d", j); */
-    }
-
     /* Reset the sort distance */
     if (c->stars.sorted == 0) {
 
@@ -3265,10 +3226,9 @@ void *runner_main(void *data) {
         case task_type_cooling:
           runner_do_cooling(r, t->ci, 1);
           break;
-        case task_type_star_formation: {
-          int formed_stars = 0;
-          runner_do_star_formation(r, t->ci, 1, &formed_stars);
-        } break;
+        case task_type_star_formation:
+          runner_do_star_formation(r, t->ci, 1);
+          break;
         default:
           error("Unknown/invalid task type (%d).", t->type);
       }