space.c 60.7 KB
Newer Older
1
/*******************************************************************************
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
 * This file is part of SWIFT.
 * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
 *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
 *               2015 Peter W. Draper (p.w.draper@durham.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/>.
 *
 ******************************************************************************/
Pedro Gonnet's avatar
Pedro Gonnet committed
23
24
25
26
27
28
29
30

/* Config parameters. */
#include "../config.h"

/* Some standard headers. */
#include <float.h>
#include <limits.h>
#include <math.h>
31
#include <stdlib.h>
32
#include <string.h>
Pedro Gonnet's avatar
Pedro Gonnet committed
33

34
35
/* MPI headers. */
#ifdef WITH_MPI
36
#include <mpi.h>
37
38
#endif

39
40
41
/* This object's header. */
#include "space.h"

Pedro Gonnet's avatar
Pedro Gonnet committed
42
/* Local headers. */
43
#include "atomic.h"
44
#include "const.h"
45
#include "cooling.h"
46
#include "engine.h"
47
#include "error.h"
48
49
#include "gravity.h"
#include "hydro.h"
50
#include "kernel_hydro.h"
51
#include "lock.h"
52
#include "memswap.h"
53
#include "minmax.h"
54
#include "runner.h"
55
#include "threadpool.h"
56
#include "tools.h"
Pedro Gonnet's avatar
Pedro Gonnet committed
57
58
59

/* Split size. */
int space_splitsize = space_splitsize_default;
60
int space_subsize = space_subsize_default;
61
int space_maxsize = space_maxsize_default;
62
int space_maxcount = space_maxcount_default;
Pedro Gonnet's avatar
Pedro Gonnet committed
63
64
65

/* Map shift vector to sortlist. */
const int sortlistID[27] = {
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
    /* ( -1 , -1 , -1 ) */ 0,
    /* ( -1 , -1 ,  0 ) */ 1,
    /* ( -1 , -1 ,  1 ) */ 2,
    /* ( -1 ,  0 , -1 ) */ 3,
    /* ( -1 ,  0 ,  0 ) */ 4,
    /* ( -1 ,  0 ,  1 ) */ 5,
    /* ( -1 ,  1 , -1 ) */ 6,
    /* ( -1 ,  1 ,  0 ) */ 7,
    /* ( -1 ,  1 ,  1 ) */ 8,
    /* (  0 , -1 , -1 ) */ 9,
    /* (  0 , -1 ,  0 ) */ 10,
    /* (  0 , -1 ,  1 ) */ 11,
    /* (  0 ,  0 , -1 ) */ 12,
    /* (  0 ,  0 ,  0 ) */ 0,
    /* (  0 ,  0 ,  1 ) */ 12,
    /* (  0 ,  1 , -1 ) */ 11,
    /* (  0 ,  1 ,  0 ) */ 10,
    /* (  0 ,  1 ,  1 ) */ 9,
    /* (  1 , -1 , -1 ) */ 8,
    /* (  1 , -1 ,  0 ) */ 7,
    /* (  1 , -1 ,  1 ) */ 6,
    /* (  1 ,  0 , -1 ) */ 5,
    /* (  1 ,  0 ,  0 ) */ 4,
    /* (  1 ,  0 ,  1 ) */ 3,
    /* (  1 ,  1 , -1 ) */ 2,
    /* (  1 ,  1 ,  0 ) */ 1,
    /* (  1 ,  1 ,  1 ) */ 0};

94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
/**
 * @brief Interval stack necessary for parallel particle sorting.
 */
struct qstack {
  volatile ptrdiff_t i, j;
  volatile int min, max;
  volatile int ready;
};

/**
 * @brief Parallel particle-sorting stack
 */
struct parallel_sort {
  struct part *parts;
  struct gpart *gparts;
  struct xpart *xparts;
  int *ind;
  struct qstack *stack;
  unsigned int stack_size;
  volatile unsigned int first, last, waiting;
};

116
117
118
119
120
121
122
123
124
/**
 * @brief Information required to compute the particle cell indices.
 */
struct index_data {
  struct space *s;
  struct cell *cells;
  int *ind;
};

125
126
127
128
129
130
131
132
133
134
135
/**
 * @brief Get the shift-id of the given pair of cells, swapping them
 *      if need be.
 *
 * @param s The space
 * @param ci Pointer to first #cell.
 * @param cj Pointer second #cell.
 * @param shift Vector from ci to cj.
 *
 * @return The shift ID and set shift, may or may not swap ci and cj.
 */
136
137
138
139
int space_getsid(struct space *s, struct cell **ci, struct cell **cj,
                 double *shift) {

  /* Get the relative distance between the pairs, wrapping. */
140
141
142
  const int periodic = s->periodic;
  double dx[3];
  for (int k = 0; k < 3; k++) {
143
144
145
146
147
148
149
150
151
152
153
    dx[k] = (*cj)->loc[k] - (*ci)->loc[k];
    if (periodic && dx[k] < -s->dim[k] / 2)
      shift[k] = s->dim[k];
    else if (periodic && dx[k] > s->dim[k] / 2)
      shift[k] = -s->dim[k];
    else
      shift[k] = 0.0;
    dx[k] += shift[k];
  }

  /* Get the sorting index. */
154
  int sid = 0;
155
  for (int k = 0; k < 3; k++)
156
157
158
159
    sid = 3 * sid + ((dx[k] < 0.0) ? 0 : ((dx[k] > 0.0) ? 2 : 1));

  /* Switch the cells around? */
  if (runner_flip[sid]) {
160
    struct cell *temp = *ci;
161
162
    *ci = *cj;
    *cj = temp;
163
    for (int k = 0; k < 3; k++) shift[k] = -shift[k];
164
165
166
167
168
169
  }
  sid = sortlistID[sid];

  /* Return the sort ID. */
  return sid;
}
170

171
/**
172
 * @brief Recursively dismantle a cell tree.
173
 *
174
175
 * @param s The #space.
 * @param c The #cell to recycle.
Matthieu Schaller's avatar
Matthieu Schaller committed
176
177
 * @param rec_begin Pointer to the start of the list of cells to recycle.
 * @param rec_end Pointer to the end of the list of cells to recycle.
178
 */
179
180
void space_rebuild_recycle_rec(struct space *s, struct cell *c,
                               struct cell **rec_begin, struct cell **rec_end) {
181
  if (c->split)
182
    for (int k = 0; k < 8; k++)
183
      if (c->progeny[k] != NULL) {
184
185
186
187
        space_rebuild_recycle_rec(s, c->progeny[k], rec_begin, rec_end);
        c->progeny[k]->next = *rec_begin;
        *rec_begin = c->progeny[k];
        if (*rec_end == NULL) *rec_end = *rec_begin;
188
189
190
191
        c->progeny[k] = NULL;
      }
}

192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
void space_rebuild_recycle_mapper(void *map_data, int num_elements,
                                  void *extra_data) {

  struct space *s = (struct space *)extra_data;
  struct cell *cells = (struct cell *)map_data;

  for (int k = 0; k < num_elements; k++) {
    struct cell *c = &cells[k];
    struct cell *rec_begin = NULL, *rec_end = NULL;
    space_rebuild_recycle_rec(s, c, &rec_begin, &rec_end);
    if (rec_begin != NULL) space_recycle_list(s, rec_begin, rec_end);
    c->sorts = NULL;
    c->nr_tasks = 0;
    c->density = NULL;
    c->gradient = NULL;
    c->force = NULL;
    c->grav = NULL;
    c->dx_max = 0.0f;
    c->sorted = 0;
    c->count = 0;
    c->gcount = 0;
    c->init = NULL;
    c->extra_ghost = NULL;
    c->ghost = NULL;
216
217
    c->kick1 = NULL;
    c->kick2 = NULL;
218
    c->drift = NULL;
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
    c->cooling = NULL;
    c->sourceterms = NULL;
    c->super = c;
    if (c->sort != NULL) {
      free(c->sort);
      c->sort = NULL;
    }
#if WITH_MPI
    c->recv_xv = NULL;
    c->recv_rho = NULL;
    c->recv_gradient = NULL;
    c->recv_ti = NULL;

    c->send_xv = NULL;
    c->send_rho = NULL;
    c->send_gradient = NULL;
    c->send_ti = NULL;
#endif
  }
}

240
/**
241
 * @brief Re-build the top-level cell grid.
242
 *
243
 * @param s The #space.
244
 * @param verbose Print messages to stdout or not.
245
 */
246
void space_regrid(struct space *s, int verbose) {
247

248
  const size_t nr_parts = s->nr_parts;
249
  const ticks tic = getticks();
250
  const integertime_t ti_current = (s->e != NULL) ? s->e->ti_current : 0;
251

252
  /* Run through the cells and get the current h_max. */
253
  // tic = getticks();
254
  float h_max = s->cell_min / kernel_gamma / space_stretch;
255
  if (nr_parts > 0) {
256
    if (s->cells_top != NULL) {
Tom Theuns's avatar
Tom Theuns committed
257
      for (int k = 0; k < s->nr_cells; k++) {
258
259
260
        if (s->cells_top[k].nodeID == engine_rank &&
            s->cells_top[k].h_max > h_max) {
          h_max = s->cells_top[k].h_max;
261
        }
262
263
      }
    } else {
264
      for (size_t k = 0; k < nr_parts; k++) {
Matthieu Schaller's avatar
Matthieu Schaller committed
265
        if (s->parts[k].h > h_max) h_max = s->parts[k].h;
266
      }
267
268
269
270
271
272
273
274
275
276
    }
  }

/* If we are running in parallel, make sure everybody agrees on
   how large the largest cell should be. */
#ifdef WITH_MPI
  {
    float buff;
    if (MPI_Allreduce(&h_max, &buff, 1, MPI_FLOAT, MPI_MAX, MPI_COMM_WORLD) !=
        MPI_SUCCESS)
277
      error("Failed to aggregate the rebuild flag across nodes.");
278
279
280
    h_max = buff;
  }
#endif
281
  if (verbose) message("h_max is %.3e (cell_min=%.3e).", h_max, s->cell_min);
282
283

  /* Get the new putative cell dimensions. */
284
  const int cdim[3] = {
285
286
287
288
289
290
      floor(s->dim[0] /
            fmax(h_max * kernel_gamma * space_stretch, s->cell_min)),
      floor(s->dim[1] /
            fmax(h_max * kernel_gamma * space_stretch, s->cell_min)),
      floor(s->dim[2] /
            fmax(h_max * kernel_gamma * space_stretch, s->cell_min))};
291
292
293
294
295

  /* Check if we have enough cells for periodicity. */
  if (s->periodic && (cdim[0] < 3 || cdim[1] < 3 || cdim[2] < 3))
    error(
        "Must have at least 3 cells in each spatial dimension when periodicity "
296
297
298
        "is switched on.\nThis error is often caused by any of the "
        "followings:\n"
        " - too few particles to generate a sensible grid,\n"
299
300
        " - the initial value of 'Scheduler:max_top_level_cells' is too "
        "small,\n"
301
        " - the (minimal) time-step is too large leading to particles with "
302
303
304
        "predicted smoothing lengths too large for the box size,\n"
        " - particle with velocities so large that they move by more than two "
        "box sizes per time-step.\n");
305

306
307
308
309
310
311
  /* Check if we have enough cells for gravity. */
  if (s->gravity && (cdim[0] < 8 || cdim[1] < 8 || cdim[2] < 8))
    error(
        "Must have at least 8 cells in each spatial dimension when gravity "
        "is switched on.");

312
313
314
/* In MPI-Land, changing the top-level cell size requires that the
 * global partition is recomputed and the particles redistributed.
 * Be prepared to do that. */
315
#ifdef WITH_MPI
Matthieu Schaller's avatar
Matthieu Schaller committed
316
  double oldwidth[3];
317
318
319
320
321
322
323
324
  double oldcdim[3];
  int *oldnodeIDs = NULL;
  if (cdim[0] < s->cdim[0] || cdim[1] < s->cdim[1] || cdim[2] < s->cdim[2]) {

    /* Capture state of current space. */
    oldcdim[0] = s->cdim[0];
    oldcdim[1] = s->cdim[1];
    oldcdim[2] = s->cdim[2];
325
326
327
    oldwidth[0] = s->width[0];
    oldwidth[1] = s->width[1];
    oldwidth[2] = s->width[2];
328
329
330
331
332
333
334
335
336

    if ((oldnodeIDs = (int *)malloc(sizeof(int) * s->nr_cells)) == NULL)
      error("Failed to allocate temporary nodeIDs.");

    int cid = 0;
    for (int i = 0; i < s->cdim[0]; i++) {
      for (int j = 0; j < s->cdim[1]; j++) {
        for (int k = 0; k < s->cdim[2]; k++) {
          cid = cell_getid(oldcdim, i, j, k);
337
          oldnodeIDs[cid] = s->cells_top[cid].nodeID;
338
339
340
341
342
        }
      }
    }
  }

343
344
345
346
#endif

  /* Do we need to re-build the upper-level cells? */
  // tic = getticks();
347
  if (s->cells_top == NULL || cdim[0] < s->cdim[0] || cdim[1] < s->cdim[1] ||
348
349
      cdim[2] < s->cdim[2]) {

350
351
352
353
354
355
/* Be verbose about this. */
#ifdef SWIFT_DEBUG_CHECKS
    message("re)griding space cdim=(%d %d %d)", cdim[0], cdim[1], cdim[2]);
    fflush(stdout);
#endif

356
    /* Free the old cells, if they were allocated. */
357
    if (s->cells_top != NULL) {
358
359
      threadpool_map(&s->e->threadpool, space_rebuild_recycle_mapper,
                     s->cells_top, s->nr_cells, sizeof(struct cell), 100, s);
360
      free(s->cells_top);
361
362
363
364
      s->maxdepth = 0;
    }

    /* Set the new cell dimensions only if smaller. */
365
    for (int k = 0; k < 3; k++) {
366
      s->cdim[k] = cdim[k];
367
368
      s->width[k] = s->dim[k] / cdim[k];
      s->iwidth[k] = 1.0 / s->width[k];
369
    }
370
    const float dmin = min(s->width[0], min(s->width[1], s->width[2]));
371
372
373

    /* Allocate the highest level of cells. */
    s->tot_cells = s->nr_cells = cdim[0] * cdim[1] * cdim[2];
374
    if (posix_memalign((void *)&s->cells_top, cell_align,
375
376
                       s->nr_cells * sizeof(struct cell)) != 0)
      error("Failed to allocate cells.");
377
    bzero(s->cells_top, s->nr_cells * sizeof(struct cell));
378
379

    /* Set the cells' locks */
380
    for (int k = 0; k < s->nr_cells; k++)
381
382
      if (lock_init(&s->cells_top[k].lock) != 0)
        error("Failed to init spinlock.");
383
384

    /* Set the cell location and sizes. */
385
386
387
    for (int i = 0; i < cdim[0]; i++)
      for (int j = 0; j < cdim[1]; j++)
        for (int k = 0; k < cdim[2]; k++) {
388
          struct cell *restrict c = &s->cells_top[cell_getid(cdim, i, j, k)];
389
390
391
392
393
394
          c->loc[0] = i * s->width[0];
          c->loc[1] = j * s->width[1];
          c->loc[2] = k * s->width[2];
          c->width[0] = s->width[0];
          c->width[1] = s->width[1];
          c->width[2] = s->width[2];
395
396
397
398
399
          c->dmin = dmin;
          c->depth = 0;
          c->count = 0;
          c->gcount = 0;
          c->super = c;
400
          c->ti_old = ti_current;
401
          lock_init(&c->lock);
Pedro Gonnet's avatar
Pedro Gonnet committed
402
        }
403
404

    /* Be verbose about the change. */
405
406
407
    if (verbose)
      message("set cell dimensions to [ %i %i %i ].", cdim[0], cdim[1],
              cdim[2]);
408

409
#ifdef WITH_MPI
410
411
412
413
414
    if (oldnodeIDs != NULL) {
      /* We have changed the top-level cell dimension, so need to redistribute
       * cells around the nodes. We repartition using the old space node
       * positions as a grid to resample. */
      if (s->e->nodeID == 0)
415
416
417
        message(
            "basic cell dimensions have increased - recalculating the "
            "global partition.");
418

Matthieu Schaller's avatar
Matthieu Schaller committed
419
      if (!partition_space_to_space(oldwidth, oldcdim, oldnodeIDs, s)) {
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437

        /* Failed, try another technique that requires no settings. */
        message("Failed to get a new partition, trying less optimal method");
        struct partition initial_partition;
#ifdef HAVE_METIS
        initial_partition.type = INITPART_METIS_NOWEIGHT;
#else
        initial_partition.type = INITPART_VECTORIZE;
#endif
        partition_initial_partition(&initial_partition, s->e->nodeID,
                                    s->e->nr_nodes, s);
      }

      /* Re-distribute the particles to their new nodes. */
      engine_redistribute(s->e);

      /* Make the proxies. */
      engine_makeproxies(s->e);
438

439
440
      /* Finished with these. */
      free(oldnodeIDs);
441
    }
Pedro Gonnet's avatar
Pedro Gonnet committed
442
#endif /* WITH_MPI */
443
444
445
446

    // message( "rebuilding upper-level cells took %.3f %s." ,
    // clocks_from_ticks(double)(getticks() - tic), clocks_getunit());

447
  }      /* re-build upper-level cells? */
448
  else { /* Otherwise, just clean up the cells. */
449
450

    /* Free the old cells, if they were allocated. */
451
452
    threadpool_map(&s->e->threadpool, space_rebuild_recycle_mapper,
                   s->cells_top, s->nr_cells, sizeof(struct cell), 100, s);
453
454
    s->maxdepth = 0;
  }
455
456
457
458

  if (verbose)
    message("took %.3f %s.", clocks_from_ticks(getticks() - tic),
            clocks_getunit());
459
}
460
461
462
463
464

/**
 * @brief Re-build the cells as well as the tasks.
 *
 * @param s The #space in which to update the cells.
465
 * @param verbose Print messages to stdout or not
466
467
 *
 */
468
void space_rebuild(struct space *s, int verbose) {
469

Matthieu Schaller's avatar
Matthieu Schaller committed
470
  const ticks tic = getticks();
471

472
473
474
475
476
/* Be verbose about this. */
#ifdef SWIFT_DEBUG_CHECKS
  message("re)building space");
  fflush(stdout);
#endif
477
478

  /* Re-grid if necessary, or just re-set the cell data. */
479
  space_regrid(s, verbose);
480

Pedro Gonnet's avatar
Pedro Gonnet committed
481
482
  size_t nr_parts = s->nr_parts;
  size_t nr_gparts = s->nr_gparts;
483
  struct cell *restrict cells_top = s->cells_top;
484
  const integertime_t ti_current = (s->e != NULL) ? s->e->ti_current : 0;
485

Pedro Gonnet's avatar
Pedro Gonnet committed
486
487
488
  /* Run through the particles and get their cell index. Allocates
     an index that is larger than the number of particles to avoid
     re-allocating after shuffling. */
489
  const size_t ind_size = s->size_parts + 100;
490
491
  int *ind;
  if ((ind = (int *)malloc(sizeof(int) * ind_size)) == NULL)
492
    error("Failed to allocate temporary particle indices.");
493
  if (s->size_parts > 0) space_parts_get_cell_index(s, ind, cells_top, verbose);
494

495
  /* Run through the gravity particles and get their cell index. */
496
  const size_t gind_size = s->size_gparts + 100;
497
498
499
  int *gind;
  if ((gind = (int *)malloc(sizeof(int) * gind_size)) == NULL)
    error("Failed to allocate temporary g-particle indices.");
Pedro Gonnet's avatar
Pedro Gonnet committed
500
501
  if (s->size_gparts > 0)
    space_gparts_get_cell_index(s, gind, cells_top, verbose);
502
503

#ifdef WITH_MPI
504

505
  /* Move non-local parts to the end of the list. */
506
  const int local_nodeID = s->e->nodeID;
507
  for (size_t k = 0; k < nr_parts;) {
508
    if (cells_top[ind[k]].nodeID != local_nodeID) {
509
      nr_parts -= 1;
Matthieu Schaller's avatar
Bug fix    
Matthieu Schaller committed
510
      const struct part tp = s->parts[k];
511
512
      s->parts[k] = s->parts[nr_parts];
      s->parts[nr_parts] = tp;
513
      if (s->parts[k].gpart != NULL) {
514
        s->parts[k].gpart->id_or_neg_offset = -k;
515
516
      }
      if (s->parts[nr_parts].gpart != NULL) {
517
        s->parts[nr_parts].gpart->id_or_neg_offset = -nr_parts;
518
      }
Matthieu Schaller's avatar
Bug fix    
Matthieu Schaller committed
519
      const struct xpart txp = s->xparts[k];
520
521
      s->xparts[k] = s->xparts[nr_parts];
      s->xparts[nr_parts] = txp;
Matthieu Schaller's avatar
Bug fix    
Matthieu Schaller committed
522
      const int t = ind[k];
523
524
      ind[k] = ind[nr_parts];
      ind[nr_parts] = t;
Matthieu Schaller's avatar
Matthieu Schaller committed
525
    } else {
526
527
528
529
      /* Increment when not exchanging otherwise we need to retest "k".*/
      k++;
    }
  }
530

531
#ifdef SWIFT_DEBUG_CHECKS
Peter W. Draper's avatar
Peter W. Draper committed
532
  /* Check that all parts are in the correct places. */
533
  for (size_t k = 0; k < nr_parts; k++) {
534
    if (cells_top[ind[k]].nodeID != local_nodeID) {
535
536
537
538
      error("Failed to move all non-local parts to send list");
    }
  }
  for (size_t k = nr_parts; k < s->nr_parts; k++) {
539
    if (cells_top[ind[k]].nodeID == local_nodeID) {
540
      error("Failed to remove local parts from send list");
541
    }
542
543
  }
#endif
544

545
  /* Move non-local gparts to the end of the list. */
546
  for (size_t k = 0; k < nr_gparts;) {
547
    if (cells_top[gind[k]].nodeID != local_nodeID) {
548
      nr_gparts -= 1;
Matthieu Schaller's avatar
Bug fix    
Matthieu Schaller committed
549
      const struct gpart tp = s->gparts[k];
550
551
      s->gparts[k] = s->gparts[nr_gparts];
      s->gparts[nr_gparts] = tp;
552
553
      if (s->gparts[k].id_or_neg_offset <= 0) {
        s->parts[-s->gparts[k].id_or_neg_offset].gpart = &s->gparts[k];
554
      }
555
556
557
      if (s->gparts[nr_gparts].id_or_neg_offset <= 0) {
        s->parts[-s->gparts[nr_gparts].id_or_neg_offset].gpart =
            &s->gparts[nr_gparts];
558
      }
Matthieu Schaller's avatar
Bug fix    
Matthieu Schaller committed
559
560
561
      const int t = gind[k];
      gind[k] = gind[nr_gparts];
      gind[nr_gparts] = t;
Matthieu Schaller's avatar
Matthieu Schaller committed
562
    } else {
563
564
565
566
      /* Increment when not exchanging otherwise we need to retest "k".*/
      k++;
    }
  }
567

568
#ifdef SWIFT_DEBUG_CHECKS
569
570
  /* Check that all gparts are in the correct place (untested). */
  for (size_t k = 0; k < nr_gparts; k++) {
571
    if (cells_top[gind[k]].nodeID != local_nodeID) {
572
573
574
575
      error("Failed to move all non-local gparts to send list");
    }
  }
  for (size_t k = nr_gparts; k < s->nr_gparts; k++) {
576
    if (cells_top[gind[k]].nodeID == local_nodeID) {
577
      error("Failed to remove local gparts from send list");
578
    }
579
580
  }
#endif
581

582
583
  /* Exchange the strays, note that this potentially re-allocates
     the parts arrays. */
584
  size_t nr_parts_exchanged = s->nr_parts - nr_parts;
585
  size_t nr_gparts_exchanged = s->nr_gparts - nr_gparts;
Pedro Gonnet's avatar
Pedro Gonnet committed
586
587
588
589
  engine_exchange_strays(s->e, nr_parts, &ind[nr_parts], &nr_parts_exchanged,
                         nr_gparts, &gind[nr_gparts], &nr_gparts_exchanged);

  /* Set the new particle counts. */
590
  s->nr_parts = nr_parts + nr_parts_exchanged;
591
  s->nr_gparts = nr_gparts + nr_gparts_exchanged;
592
593

  /* Re-allocate the index array if needed.. */
594
  if (s->nr_parts + 1 > ind_size) {
595
    int *ind_new;
596
    if ((ind_new = (int *)malloc(sizeof(int) * (s->nr_parts + 1))) == NULL)
597
      error("Failed to allocate temporary particle indices.");
598
    memcpy(ind_new, ind, sizeof(int) * nr_parts);
599
600
    free(ind);
    ind = ind_new;
601
602
  }

603
604
605
  const int cdim[3] = {s->cdim[0], s->cdim[1], s->cdim[2]};
  const double ih[3] = {s->iwidth[0], s->iwidth[1], s->iwidth[2]};

606
  /* Assign each particle to its cell. */
Pedro Gonnet's avatar
Pedro Gonnet committed
607
  for (size_t k = nr_parts; k < s->nr_parts; k++) {
Matthieu Schaller's avatar
Matthieu Schaller committed
608
    const struct part *const p = &s->parts[k];
609
    ind[k] =
610
        cell_getid(cdim, p->x[0] * ih[0], p->x[1] * ih[1], p->x[2] * ih[2]);
611
#ifdef SWIFT_DEBUG_CHECKS
612
    if (cells_top[ind[k]].nodeID != local_nodeID)
613
      error("Received part that does not belong to me (nodeID=%i).",
614
            cells_top[ind[k]].nodeID);
615
#endif
616
  }
617
  nr_parts = s->nr_parts;
618
619

#endif /* WITH_MPI */
620
621

  /* Sort the parts according to their cells. */
622
623
  if (nr_parts > 0)
    space_parts_sort(s, ind, nr_parts, 0, s->nr_cells - 1, verbose);
624
625

  /* Re-link the gparts. */
626
  if (nr_parts > 0 && nr_gparts > 0) part_relink_gparts(s->parts, nr_parts, 0);
627

628
#ifdef SWIFT_DEBUG_CHECKS
629
  /* Verify space_sort_struct. */
630
631
632
  for (size_t k = 1; k < nr_parts; k++) {
    if (ind[k - 1] > ind[k]) {
      error("Sort failed!");
633
    } else if (ind[k] != cell_getid(s->cdim, s->parts[k].x[0] * s->iwidth[0],
634
635
                                    s->parts[k].x[1] * s->iwidth[1],
                                    s->parts[k].x[2] * s->iwidth[2])) {
636
637
638
639
      error("Incorrect indices!");
    }
  }
#endif
640

641
642
643
644
645
646
647
648
649
650
  /* Extract the cell counts from the sorted indices. */
  size_t last_index = 0;
  ind[nr_parts] = s->nr_cells;  // sentinel.
  for (size_t k = 0; k < nr_parts; k++) {
    if (ind[k] < ind[k + 1]) {
      cells_top[ind[k]].count = k - last_index + 1;
      last_index = k + 1;
    }
  }

651
  /* We no longer need the indices as of here. */
652
  free(ind);
653

654
655
656
#ifdef WITH_MPI

  /* Re-allocate the index array if needed.. */
657
  if (s->nr_gparts + 1 > gind_size) {
658
    int *gind_new;
659
    if ((gind_new = (int *)malloc(sizeof(int) * (s->nr_gparts + 1))) == NULL)
660
      error("Failed to allocate temporary g-particle indices.");
661
    memcpy(gind_new, gind, sizeof(int) * nr_gparts);
662
663
664
665
666
    free(gind);
    gind = gind_new;
  }

  /* Assign each particle to its cell. */
667
  for (size_t k = nr_gparts; k < s->nr_gparts; k++) {
Matthieu Schaller's avatar
Matthieu Schaller committed
668
    const struct gpart *const p = &s->gparts[k];
669
670
    gind[k] =
        cell_getid(cdim, p->x[0] * ih[0], p->x[1] * ih[1], p->x[2] * ih[2]);
671
672

#ifdef SWIFT_DEBUG_CHECKS
673
    if (cells_top[gind[k]].nodeID != s->e->nodeID)
674
      error("Received part that does not belong to me (nodeID=%i).",
675
            cells_top[gind[k]].nodeID);
676
#endif
677
678
679
680
  }
  nr_gparts = s->nr_gparts;

#endif
681

682
  /* Sort the gparts according to their cells. */
683
684
  if (nr_gparts > 0)
    space_gparts_sort(s, gind, nr_gparts, 0, s->nr_cells - 1, verbose);
685
686

  /* Re-link the parts. */
687
688
  if (nr_parts > 0 && nr_gparts > 0)
    part_relink_parts(s->gparts, nr_gparts, s->parts);
689

690
691
  /* Extract the cell counts from the sorted indices. */
  size_t last_gindex = 0;
692
  gind[nr_gparts] = s->nr_cells;
693
694
  for (size_t k = 0; k < nr_gparts; k++) {
    if (gind[k] < gind[k + 1]) {
695
      cells_top[gind[k]].gcount = k - last_gindex + 1;
696
697
698
      last_gindex = k + 1;
    }
  }
699
700

  /* We no longer need the indices as of here. */
701
  free(gind);
702

703
#ifdef SWIFT_DEBUG_CHECKS
704
705
706
  /* Verify that the links are correct */
  for (size_t k = 0; k < nr_gparts; ++k) {

707
    if (s->gparts[k].id_or_neg_offset < 0) {
708

709
      const struct part *part = &s->parts[-s->gparts[k].id_or_neg_offset];
710

711
712
713
714
      if (part->gpart != &s->gparts[k]) error("Linking problem !");

      if (s->gparts[k].x[0] != part->x[0] || s->gparts[k].x[1] != part->x[1] ||
          s->gparts[k].x[2] != part->x[2])
715
716
717
718
719
        error("Linked particles are not at the same position !");
    }
  }
  for (size_t k = 0; k < nr_parts; ++k) {

720
    if (s->parts[k].gpart != NULL &&
721
        s->parts[k].gpart->id_or_neg_offset != -(ptrdiff_t)k) {
722
      error("Linking problem !");
723
724
    }
  }
725
#endif
726

727
728
  /* Hook the cells up to the parts. */
  // tic = getticks();
729
730
731
  struct part *finger = s->parts;
  struct xpart *xfinger = s->xparts;
  struct gpart *gfinger = s->gparts;
732
  for (int k = 0; k < s->nr_cells; k++) {
733
    struct cell *restrict c = &cells_top[k];
734
    c->ti_old = ti_current;
735
736
737
738
739
740
741
    c->parts = finger;
    c->xparts = xfinger;
    c->gparts = gfinger;
    finger = &finger[c->count];
    xfinger = &xfinger[c->count];
    gfinger = &gfinger[c->gcount];
  }
742
  // message( "hooking up cells took %.3f %s." ,
Matthieu Schaller's avatar
Matthieu Schaller committed
743
  // clocks_from_ticks(getticks() - tic), clocks_getunit());
744
745
746

  /* At this point, we have the upper-level cells, old or new. Now make
     sure that the parts in each cell are ok. */
747
  space_split(s, cells_top, s->nr_cells, verbose);
748
749
750
751
752
753
754
755
756

  if (verbose)
    message("took %.3f %s.", clocks_from_ticks(getticks() - tic),
            clocks_getunit());
}

/**
 * @brief Split particles between cells of a hierarchy
 *
757
758
 * This is done in parallel using threads in the #threadpool.
 *
759
 * @param s The #space.
760
761
 * @param cells The cell hierarchy.
 * @param nr_cells The number of cells.
762
763
 * @param verbose Are we talkative ?
 */
764
765
void space_split(struct space *s, struct cell *cells, int nr_cells,
                 int verbose) {
766

Matthieu Schaller's avatar
Matthieu Schaller committed
767
  const ticks tic = getticks();
768

769
  threadpool_map(&s->e->threadpool, space_split_mapper, cells, nr_cells,
770
                 sizeof(struct cell), 1, s);
771

772
773
774
  if (verbose)
    message("took %.3f %s.", clocks_from_ticks(getticks() - tic),
            clocks_getunit());
775
}
776

777
778
779
780
781
782
783
784
/**
 * @brief Runs through the top-level cells and checks whether tasks associated
 * with them can be split. If not, try to sanitize the cells.
 *
 * @param s The #space to act upon.
 */
void space_sanitize(struct space *s) {

785
786
  s->sanitized = 1;

787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
  for (int k = 0; k < s->nr_cells; k++) {

    struct cell *c = &s->cells_top[k];
    const double min_width = c->dmin;

    /* Do we have a problem ? */
    if (c->h_max * kernel_gamma * space_stretch > min_width * 0.5 &&
        c->count > space_maxcount) {

      /* Ok, clean-up the mess */
      cell_sanitize(c);
    }
  }
}

802
/**
803
 * @brief #threadpool mapper function to compute the particle cell indices.
804
 *
805
 * @param map_data Pointer towards the particles.
806
 * @param nr_parts The number of particles to treat.
807
 * @param extra_data Pointers to the space and index list
808
 */
809
810
void space_parts_get_cell_index_mapper(void *map_data, int nr_parts,
                                       void *extra_data) {
811

812
813
814
815
  /* Unpack the data */
  struct part *restrict parts = (struct part *)map_data;
  struct index_data *data = (struct index_data *)extra_data;
  struct space *s = data->s;
816
  int *const ind = data->ind + (ptrdiff_t)(parts - s->parts);
817
818

  /* Get some constants */
819
820
821
  const double dim_x = s->dim[0];
  const double dim_y = s->dim[1];
  const double dim_z = s->dim[2];
Matthieu Schaller's avatar
Matthieu Schaller committed
822
  const int cdim[3] = {s->cdim[0], s->cdim[1], s->cdim[2]};
823
824
825
  const double ih_x = s->iwidth[0];
  const double ih_y = s->iwidth[1];
  const double ih_z = s->iwidth[2];
826

827
  for (int k = 0; k < nr_parts; k++) {
828
829
830
831

    /* Get the particle */
    struct part *restrict p = &parts[k];

832
833
834
835
    const double old_pos_x = p->x[0];
    const double old_pos_y = p->x[1];
    const double old_pos_z = p->x[2];

836
    /* Put it back into the simulation volume */
837
838
839
    const double pos_x = box_wrap(old_pos_x, 0.0, dim_x);
    const double pos_y = box_wrap(old_pos_y, 0.0, dim_y);
    const double pos_z = box_wrap(old_pos_z, 0.0, dim_z);
840
841

    /* Get its cell index */
Matthieu Schaller's avatar
Matthieu Schaller committed
842
843
    const int index =
        cell_getid(cdim, pos_x * ih_x, pos_y * ih_y, pos_z * ih_z);
844
    ind[k] = index;
845

846
847
848
849
    /* Update the position */
    p->x[0] = pos_x;
    p->x[1] = pos_y;
    p->x[2] = pos_z;
850
851
852
853
  }
}

/**
854
 * @brief #threadpool mapper function to compute the g-particle cell indices.
855
 *
856
 * @param map_data Pointer towards the g-particles.
857
 * @param nr_gparts The number of g-particles to treat.
858
 * @param extra_data Pointers to the space and index list
859
 */
860
861
void space_gparts_get_cell_index_mapper(void *map_data, int nr_gparts,
                                        void *extra_data) {
862

863
864
865
866
  /* Unpack the data */
  struct gpart *restrict gparts = (struct gpart *)map_data;
  struct index_data *data = (struct index_data *)extra_data;
  struct space *s = data->s;
867
  int *const ind = data->ind + (ptrdiff_t)(gparts - s->gparts);
868
869

  /* Get some constants */
Matthieu Schaller's avatar
Matthieu Schaller committed
870
871
872
  const double dim_x = s->dim[0];
  const double dim_y = s->dim[1];
  const double dim_z = s->dim[2];
873
  const int cdim[3] = {s->cdim[0], s->cdim[1], s->cdim[2]};
Matthieu Schaller's avatar
Matthieu Schaller committed
874
875
876
  const double ih_x = s->iwidth[0];
  const double ih_y = s->iwidth[1];
  const double ih_z = s->iwidth[2];
877

878
  for (int k = 0; k < nr_gparts; k++) {
879
880
881
882

    /* Get the particle */
    struct gpart *restrict gp = &gparts[k];

Matthieu Schaller's avatar
Matthieu Schaller committed
883
884
885
886
    const double old_pos_x = gp->x[0];
    const double old_pos_y = gp->x[1];
    const double old_pos_z = gp->x[2];

887
    /* Put it back into the simulation volume */
Matthieu Schaller's avatar
Matthieu Schaller committed
888
889
890
    const double pos_x = box_wrap(old_pos_x, 0.0, dim_x);
    const double pos_y = box_wrap(old_pos_y, 0.0, dim_y);
    const double pos_z = box_wrap(old_pos_z, 0.0, dim_z);
891
892
893

    /* Get its cell index */
    const int index =
Matthieu Schaller's avatar
Matthieu Schaller committed
894
        cell_getid(cdim, pos_x * ih_x, pos_y * ih_y, pos_z * ih_z);
895
    ind[k] = index;
Matthieu Schaller's avatar
Matthieu Schaller committed
896
897
898
899
900

    /* Update the position */
    gp->x[0] = pos_x;
    gp->x[1] = pos_y;
    gp->x[2] = pos_z;
901
902
903
  }
}

904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
/**
 * @brief Computes the cell index of all the particles and update the cell
 * count.
 *
 * @param s The #space.
 * @param ind The array of indices to fill.
 * @param cells The array of #cell to update.
 * @param verbose Are we talkative ?
 */
void space_parts_get_cell_index(struct space *s, int *ind, struct cell *cells,
                                int verbose) {

  const ticks tic = getticks();

  /* Pack the extra information */
  struct index_data data;
  data.s = s;
  data.cells = cells;
  data.ind = ind;

  threadpool_map(&s->e->threadpool, space_parts_get_cell_index_mapper, s->parts,
                 s->nr_parts, sizeof(struct part), 1000, &data);

  if (verbose)
    message("took %.3f %s.", clocks_from_ticks(getticks() - tic),
            clocks_getunit());
}

/**
 * @brief Computes the cell index of all the g-particles and update the cell
 * gcount.
 *
 * @param s The #space.
 * @param gind The array of indices to fill.
 * @param cells The array of #cell to update.
 * @param verbose Are we talkative ?
 */
void space_gparts_get_cell_index(struct space *s, int *gind, struct cell *cells,
                                 int verbose) {

  const ticks tic = getticks();

  /* Pack the extra information */
  struct index_data data;
  data.s = s;
  data.cells = cells;
  data.ind = gind;

  threadpool_map(&s->e->threadpool, space_gparts_get_cell_index_mapper,
                 s->gparts, s->nr_gparts, sizeof(struct gpart), 1000, &data);

  if (verbose)
    message("took %.3f %s.", clocks_from_ticks(getticks() - tic),
            clocks_getunit());
}

960
/**
961
 * @brief Sort the particles and condensed particles according to the given
962
 * indices.
963
 *
Matthieu Schaller's avatar
Matthieu Schaller committed
964
 * @param s The #space.
965
966
967
968
 * @param ind The indices with respect to which the parts are sorted.
 * @param N The number of parts
 * @param min Lowest index.
 * @param max highest index.
969
 * @param verbose Are we talkative ?
970
 */
971
void space_parts_sort(struct space *s, int *ind, size_t N, int min, int max,
972
973
                      int verbose) {

Matthieu Schaller's avatar
Matthieu Schaller committed
974
  const ticks tic = getticks();
975

976
977
978
979
980
981
  /* Populate a parallel_sort structure with the input data */
  struct parallel_sort sort_struct;
  sort_struct.parts = s->parts;
  sort_struct.xparts = s->xparts;
  sort_struct.ind = ind;
  sort_struct.stack_size = 2 * (max - min + 1) + 10 + s->e->nr_threads;
982
983
  if ((sort_stru