space.c 100 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 "multipole.h"
55
#include "runner.h"
56
#include "sort_part.h"
57
#include "stars.h"
58
#include "threadpool.h"
59
#include "tools.h"
Pedro Gonnet's avatar
Pedro Gonnet committed
60
61
62

/* Split size. */
int space_splitsize = space_splitsize_default;
63
64
int space_subsize_pair = space_subsize_pair_default;
int space_subsize_self = space_subsize_self_default;
65
int space_subsize_self_grav = space_subsize_self_grav_default;
66
int space_maxsize = space_maxsize_default;
Pedro Gonnet's avatar
Pedro Gonnet committed
67

68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
/**
 * @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;
84
  struct spart *sparts;
85
86
87
88
89
90
  int *ind;
  struct qstack *stack;
  unsigned int stack_size;
  volatile unsigned int first, last, waiting;
};

91
92
93
94
95
96
97
98
99
/**
 * @brief Information required to compute the particle cell indices.
 */
struct index_data {
  struct space *s;
  struct cell *cells;
  int *ind;
};

100
101
102
103
104
105
106
107
108
109
110
/**
 * @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.
 */
111
112
113
114
int space_getsid(struct space *s, struct cell **ci, struct cell **cj,
                 double *shift) {

  /* Get the relative distance between the pairs, wrapping. */
115
116
117
  const int periodic = s->periodic;
  double dx[3];
  for (int k = 0; k < 3; k++) {
118
119
120
121
122
123
124
125
126
127
128
    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. */
129
  int sid = 0;
130
  for (int k = 0; k < 3; k++)
131
132
133
134
    sid = 3 * sid + ((dx[k] < 0.0) ? 0 : ((dx[k] > 0.0) ? 2 : 1));

  /* Switch the cells around? */
  if (runner_flip[sid]) {
135
    struct cell *temp = *ci;
136
137
    *ci = *cj;
    *cj = temp;
138
    for (int k = 0; k < 3; k++) shift[k] = -shift[k];
139
140
141
142
143
144
  }
  sid = sortlistID[sid];

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

146
/**
147
 * @brief Recursively dismantle a cell tree.
148
 *
149
150
 * @param s The #space.
 * @param c The #cell to recycle.
Matthieu Schaller's avatar
Matthieu Schaller committed
151
152
153
154
155
156
 * @param cell_rec_begin Pointer to the start of the list of cells to recycle.
 * @param cell_rec_end Pointer to the end of the list of cells to recycle.
 * @param multipole_rec_begin Pointer to the start of the list of multipoles to
 * recycle.
 * @param multipole_rec_end Pointer to the end of the list of multipoles to
 * recycle.
157
 */
158
void space_rebuild_recycle_rec(struct space *s, struct cell *c,
159
160
                               struct cell **cell_rec_begin,
                               struct cell **cell_rec_end,
161
162
                               struct gravity_tensors **multipole_rec_begin,
                               struct gravity_tensors **multipole_rec_end) {
163
  if (c->split)
164
    for (int k = 0; k < 8; k++)
165
      if (c->progeny[k] != NULL) {
166
167
168
169
170
171
        space_rebuild_recycle_rec(s, c->progeny[k], cell_rec_begin,
                                  cell_rec_end, multipole_rec_begin,
                                  multipole_rec_end);

        c->progeny[k]->next = *cell_rec_begin;
        *cell_rec_begin = c->progeny[k];
172
173
174
175
176

        if (s->gravity) {
          c->progeny[k]->multipole->next = *multipole_rec_begin;
          *multipole_rec_begin = c->progeny[k]->multipole;
        }
177
178

        if (*cell_rec_end == NULL) *cell_rec_end = *cell_rec_begin;
179
        if (s->gravity && *multipole_rec_end == NULL)
180
181
182
          *multipole_rec_end = *multipole_rec_begin;

        c->progeny[k]->multipole = NULL;
183
184
185
186
        c->progeny[k] = NULL;
      }
}

187
188
189
190
191
192
193
194
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];
195
    struct cell *cell_rec_begin = NULL, *cell_rec_end = NULL;
196
197
    struct gravity_tensors *multipole_rec_begin = NULL,
                           *multipole_rec_end = NULL;
198
199
200
201
202
    space_rebuild_recycle_rec(s, c, &cell_rec_begin, &cell_rec_end,
                              &multipole_rec_begin, &multipole_rec_end);
    if (cell_rec_begin != NULL)
      space_recycle_list(s, cell_rec_begin, cell_rec_end, multipole_rec_begin,
                         multipole_rec_end);
203
204
205
206
207
208
    c->sorts = NULL;
    c->nr_tasks = 0;
    c->density = NULL;
    c->gradient = NULL;
    c->force = NULL;
    c->grav = NULL;
209
210
    c->dx_max_part = 0.0f;
    c->dx_max_gpart = 0.0f;
211
    c->dx_max_sort = 0.0f;
212
213
214
    c->sorted = 0;
    c->count = 0;
    c->gcount = 0;
215
    c->scount = 0;
216
    c->init_grav = NULL;
217
    c->extra_ghost = NULL;
218
219
    c->ghost_in = NULL;
    c->ghost_out = NULL;
220
    c->ghost = NULL;
221
222
    c->kick1 = NULL;
    c->kick2 = NULL;
223
    c->timestep = NULL;
224
225
    c->drift_part = NULL;
    c->drift_gpart = NULL;
226
227
    c->cooling = NULL;
    c->sourceterms = NULL;
228
229
    c->grav_ghost[0] = NULL;
    c->grav_ghost[1] = NULL;
230
231
    c->grav_long_range = NULL;
    c->grav_down = NULL;
232
    c->super = c;
233
234
235
236
    c->parts = NULL;
    c->xparts = NULL;
    c->gparts = NULL;
    c->sparts = NULL;
Matthieu Schaller's avatar
Matthieu Schaller committed
237
    if (s->gravity) bzero(c->multipole, sizeof(struct gravity_tensors));
238
239
240
241
242
    for (int i = 0; i < 13; i++)
      if (c->sort[i] != NULL) {
        free(c->sort[i]);
        c->sort[i] = NULL;
      }
243
244
245
246
#if WITH_MPI
    c->recv_xv = NULL;
    c->recv_rho = NULL;
    c->recv_gradient = NULL;
247
    c->recv_grav = NULL;
248
249
250
251
252
    c->recv_ti = NULL;

    c->send_xv = NULL;
    c->send_rho = NULL;
    c->send_gradient = NULL;
253
    c->send_grav = NULL;
254
255
256
257
258
    c->send_ti = NULL;
#endif
  }
}

259
260
261
262
/**
 * @brief Free up any allocated cells.
 */
void space_free_cells(struct space *s) {
Matthieu Schaller's avatar
Matthieu Schaller committed
263
264
  threadpool_map(&s->e->threadpool, space_rebuild_recycle_mapper, s->cells_top,
                 s->nr_cells, sizeof(struct cell), 0, s);
265
266
267
  s->maxdepth = 0;
}

268
/**
269
 * @brief Re-build the top-level cell grid.
270
 *
271
 * @param s The #space.
272
 * @param verbose Print messages to stdout or not.
273
 */
274
void space_regrid(struct space *s, int verbose) {
275

276
  const size_t nr_parts = s->nr_parts;
277
  const ticks tic = getticks();
278
  const integertime_t ti_old = (s->e != NULL) ? s->e->ti_old : 0;
279

280
  /* Run through the cells and get the current h_max. */
281
  // tic = getticks();
282
  float h_max = s->cell_min / kernel_gamma / space_stretch;
283
  if (nr_parts > 0) {
284
    if (s->cells_top != NULL) {
Tom Theuns's avatar
Tom Theuns committed
285
      for (int k = 0; k < s->nr_cells; k++) {
286
287
288
        if (s->cells_top[k].nodeID == engine_rank &&
            s->cells_top[k].h_max > h_max) {
          h_max = s->cells_top[k].h_max;
289
        }
290
291
      }
    } else {
292
      for (size_t k = 0; k < nr_parts; k++) {
Matthieu Schaller's avatar
Matthieu Schaller committed
293
        if (s->parts[k].h > h_max) h_max = s->parts[k].h;
294
      }
295
296
297
298
299
300
301
302
303
304
    }
  }

/* 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)
305
      error("Failed to aggregate the rebuild flag across nodes.");
306
307
308
    h_max = buff;
  }
#endif
309
  if (verbose) message("h_max is %.3e (cell_min=%.3e).", h_max, s->cell_min);
310
311

  /* Get the new putative cell dimensions. */
312
  const int cdim[3] = {
313
314
315
316
317
318
      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))};
319
320
321
322
323

  /* 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 "
324
325
326
        "is switched on.\nThis error is often caused by any of the "
        "followings:\n"
        " - too few particles to generate a sensible grid,\n"
327
328
        " - the initial value of 'Scheduler:max_top_level_cells' is too "
        "small,\n"
329
        " - the (minimal) time-step is too large leading to particles with "
330
        "predicted smoothing lengths too large for the box size,\n"
331
        " - particles with velocities so large that they move by more than two "
332
        "box sizes per time-step.\n");
333

334
  /* Check if we have enough cells for periodic gravity. */
335
  if (s->gravity && s->periodic && (cdim[0] < 8 || cdim[1] < 8 || cdim[2] < 8))
336
    error(
337
338
        "Must have at least 8 cells in each spatial dimension when periodic "
        "gravity is switched on.\nThis error is often caused by any of the "
339
340
341
342
343
344
        "followings:\n"
        " - too few particles to generate a sensible grid,\n"
        " - the initial value of 'Scheduler:max_top_level_cells' is too "
        "small,\n"
        " - the (minimal) time-step is too large leading to particles with "
        "predicted smoothing lengths too large for the box size,\n"
345
        " - particles with velocities so large that they move by more than two "
346
        "box sizes per time-step.\n");
347

348
349
350
/* 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. */
351
#ifdef WITH_MPI
Matthieu Schaller's avatar
Matthieu Schaller committed
352
  double oldwidth[3];
353
354
355
356
357
358
359
360
  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];
361
362
363
    oldwidth[0] = s->width[0];
    oldwidth[1] = s->width[1];
    oldwidth[2] = s->width[2];
364
365
366
367
368
369
370
371
372

    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);
373
          oldnodeIDs[cid] = s->cells_top[cid].nodeID;
374
375
376
377
378
        }
      }
    }
  }

379
380
381
382
#endif

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

386
387
/* Be verbose about this. */
#ifdef SWIFT_DEBUG_CHECKS
388
    message("(re)griding space cdim=(%d %d %d)", cdim[0], cdim[1], cdim[2]);
389
390
391
    fflush(stdout);
#endif

392
    /* Free the old cells, if they were allocated. */
393
    if (s->cells_top != NULL) {
394
      space_free_cells(s);
395
      free(s->local_cells_top);
396
      free(s->cells_top);
397
      free(s->multipoles_top);
398
399
    }

400
401
402
403
    /* Also free the task arrays, these will be regenerated and we can use the
     * memory while copying the particle arrays. */
    if (s->e != NULL) scheduler_free_tasks(&s->e->sched);

404
    /* Set the new cell dimensions only if smaller. */
405
    for (int k = 0; k < 3; k++) {
406
      s->cdim[k] = cdim[k];
407
408
      s->width[k] = s->dim[k] / cdim[k];
      s->iwidth[k] = 1.0 / s->width[k];
409
    }
410
    const float dmin = min3(s->width[0], s->width[1], s->width[2]);
411
412
413

    /* Allocate the highest level of cells. */
    s->tot_cells = s->nr_cells = cdim[0] * cdim[1] * cdim[2];
414
    if (posix_memalign((void *)&s->cells_top, cell_align,
415
                       s->nr_cells * sizeof(struct cell)) != 0)
416
      error("Failed to allocate top-level cells.");
417
    bzero(s->cells_top, s->nr_cells * sizeof(struct cell));
418

419
420
421
    /* Allocate the multipoles for the top-level cells. */
    if (s->gravity) {
      if (posix_memalign((void *)&s->multipoles_top, multipole_align,
422
                         s->nr_cells * sizeof(struct gravity_tensors)) != 0)
423
        error("Failed to allocate top-level multipoles.");
424
      bzero(s->multipoles_top, s->nr_cells * sizeof(struct gravity_tensors));
425
426
    }

427
428
429
430
431
432
    /* Allocate the indices of local cells */
    if (posix_memalign((void *)&s->local_cells_top, SWIFT_STRUCT_ALIGNMENT,
                       s->nr_cells * sizeof(int)) != 0)
      error("Failed to allocate indices of local top-level cells.");
    bzero(s->local_cells_top, s->nr_cells * sizeof(int));

433
    /* Set the cells' locks */
434
    for (int k = 0; k < s->nr_cells; k++) {
435
      if (lock_init(&s->cells_top[k].lock) != 0)
436
437
438
439
440
441
442
443
        error("Failed to init spinlock for hydro.");
      if (lock_init(&s->cells_top[k].glock) != 0)
        error("Failed to init spinlock for gravity.");
      if (lock_init(&s->cells_top[k].mlock) != 0)
        error("Failed to init spinlock for multipoles.");
      if (lock_init(&s->cells_top[k].slock) != 0)
        error("Failed to init spinlock for stars.");
    }
444
445

    /* Set the cell location and sizes. */
446
447
448
    for (int i = 0; i < cdim[0]; i++)
      for (int j = 0; j < cdim[1]; j++)
        for (int k = 0; k < cdim[2]; k++) {
449
450
          const size_t cid = cell_getid(cdim, i, j, k);
          struct cell *restrict c = &s->cells_top[cid];
451
452
453
454
455
456
          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];
457
458
459
460
          c->dmin = dmin;
          c->depth = 0;
          c->count = 0;
          c->gcount = 0;
461
          c->scount = 0;
462
          c->super = c;
463
464
          c->ti_old_part = ti_old;
          c->ti_old_gpart = ti_old;
465
          c->ti_old_multipole = ti_old;
466
          if (s->gravity) c->multipole = &s->multipoles_top[cid];
Pedro Gonnet's avatar
Pedro Gonnet committed
467
        }
468
469

    /* Be verbose about the change. */
470
471
472
    if (verbose)
      message("set cell dimensions to [ %i %i %i ].", cdim[0], cdim[1],
              cdim[2]);
473

474
#ifdef WITH_MPI
475
476
477
478
479
    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)
480
481
482
        message(
            "basic cell dimensions have increased - recalculating the "
            "global partition.");
483

Matthieu Schaller's avatar
Matthieu Schaller committed
484
      if (!partition_space_to_space(oldwidth, oldcdim, oldnodeIDs, s)) {
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502

        /* 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);
503

504
505
      /* Finished with these. */
      free(oldnodeIDs);
506
    }
Pedro Gonnet's avatar
Pedro Gonnet committed
507
#endif /* WITH_MPI */
508
509
510
511

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

512
  }      /* re-build upper-level cells? */
513
  else { /* Otherwise, just clean up the cells. */
514
515

    /* Free the old cells, if they were allocated. */
516
    space_free_cells(s);
517
  }
518
519
520
521

  if (verbose)
    message("took %.3f %s.", clocks_from_ticks(getticks() - tic),
            clocks_getunit());
522
}
523
524
525
526
527

/**
 * @brief Re-build the cells as well as the tasks.
 *
 * @param s The #space in which to update the cells.
528
 * @param verbose Print messages to stdout or not
529
530
 *
 */
531
void space_rebuild(struct space *s, int verbose) {
532

Matthieu Schaller's avatar
Matthieu Schaller committed
533
  const ticks tic = getticks();
534

535
536
/* Be verbose about this. */
#ifdef SWIFT_DEBUG_CHECKS
Pedro Gonnet's avatar
Pedro Gonnet committed
537
  if (s->e->nodeID == 0 || verbose) message("(re)building space");
538
539
  fflush(stdout);
#endif
540
541

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

Pedro Gonnet's avatar
Pedro Gonnet committed
544
545
  size_t nr_parts = s->nr_parts;
  size_t nr_gparts = s->nr_gparts;
546
  size_t nr_sparts = s->nr_sparts;
547
  struct cell *restrict cells_top = s->cells_top;
548
  const integertime_t ti_old = (s->e != NULL) ? s->e->ti_old : 0;
549

Pedro Gonnet's avatar
Pedro Gonnet committed
550
551
552
  /* 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. */
553
  const size_t ind_size = s->size_parts + 100;
554
555
  int *ind;
  if ((ind = (int *)malloc(sizeof(int) * ind_size)) == NULL)
556
    error("Failed to allocate temporary particle indices.");
557
  if (s->size_parts > 0) space_parts_get_cell_index(s, ind, cells_top, verbose);
558

559
  /* Run through the gravity particles and get their cell index. */
560
  const size_t gind_size = s->size_gparts + 100;
561
562
563
  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
564
565
  if (s->size_gparts > 0)
    space_gparts_get_cell_index(s, gind, cells_top, verbose);
566

567
568
569
570
571
572
573
574
  /* Run through the star particles and get their cell index. */
  const size_t sind_size = s->size_sparts + 100;
  int *sind;
  if ((sind = (int *)malloc(sizeof(int) * sind_size)) == NULL)
    error("Failed to allocate temporary s-particle indices.");
  if (s->size_sparts > 0)
    space_sparts_get_cell_index(s, sind, cells_top, verbose);

575
#ifdef WITH_MPI
576
  const int local_nodeID = s->e->nodeID;
577

578
  /* Move non-local parts to the end of the list. */
579
  for (size_t k = 0; k < nr_parts;) {
580
    if (cells_top[ind[k]].nodeID != local_nodeID) {
581
      nr_parts -= 1;
582
      /* Swap the particle */
Matthieu Schaller's avatar
Bug fix    
Matthieu Schaller committed
583
      const struct part tp = s->parts[k];
584
585
      s->parts[k] = s->parts[nr_parts];
      s->parts[nr_parts] = tp;
586
      /* Swap the link with the gpart */
587
      if (s->parts[k].gpart != NULL) {
588
        s->parts[k].gpart->id_or_neg_offset = -k;
589
590
      }
      if (s->parts[nr_parts].gpart != NULL) {
591
        s->parts[nr_parts].gpart->id_or_neg_offset = -nr_parts;
592
      }
593
      /* Swap the xpart */
Matthieu Schaller's avatar
Bug fix    
Matthieu Schaller committed
594
      const struct xpart txp = s->xparts[k];
595
596
      s->xparts[k] = s->xparts[nr_parts];
      s->xparts[nr_parts] = txp;
597
      /* Swap the index */
Matthieu Schaller's avatar
Bug fix    
Matthieu Schaller committed
598
      const int t = ind[k];
599
600
      ind[k] = ind[nr_parts];
      ind[nr_parts] = t;
Matthieu Schaller's avatar
Matthieu Schaller committed
601
    } else {
602
603
604
605
      /* Increment when not exchanging otherwise we need to retest "k".*/
      k++;
    }
  }
606

607
#ifdef SWIFT_DEBUG_CHECKS
Peter W. Draper's avatar
Peter W. Draper committed
608
  /* Check that all parts are in the correct places. */
609
  for (size_t k = 0; k < nr_parts; k++) {
610
    if (cells_top[ind[k]].nodeID != local_nodeID) {
611
612
613
614
      error("Failed to move all non-local parts to send list");
    }
  }
  for (size_t k = nr_parts; k < s->nr_parts; k++) {
615
    if (cells_top[ind[k]].nodeID == local_nodeID) {
616
      error("Failed to remove local parts from send list");
617
    }
618
619
  }
#endif
620

621
622
623
624
625
626
627
628
629
630
631
632
  /* Move non-local sparts to the end of the list. */
  for (size_t k = 0; k < nr_sparts;) {
    if (cells_top[sind[k]].nodeID != local_nodeID) {
      nr_sparts -= 1;
      /* Swap the particle */
      const struct spart tp = s->sparts[k];
      s->sparts[k] = s->sparts[nr_sparts];
      s->sparts[nr_sparts] = tp;
      /* Swap the link with the gpart */
      if (s->sparts[k].gpart != NULL) {
        s->sparts[k].gpart->id_or_neg_offset = -k;
      }
633
634
      if (s->sparts[nr_sparts].gpart != NULL) {
        s->sparts[nr_sparts].gpart->id_or_neg_offset = -nr_sparts;
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
      }
      /* Swap the index */
      const int t = sind[k];
      sind[k] = sind[nr_sparts];
      sind[nr_sparts] = t;
    } else {
      /* Increment when not exchanging otherwise we need to retest "k".*/
      k++;
    }
  }

#ifdef SWIFT_DEBUG_CHECKS
  /* Check that all sparts are in the correct place (untested). */
  for (size_t k = 0; k < nr_sparts; k++) {
    if (cells_top[sind[k]].nodeID != local_nodeID) {
      error("Failed to move all non-local sparts to send list");
    }
  }
  for (size_t k = nr_sparts; k < s->nr_sparts; k++) {
    if (cells_top[sind[k]].nodeID == local_nodeID) {
      error("Failed to remove local sparts from send list");
    }
  }
#endif

660
  /* Move non-local gparts to the end of the list. */
661
  for (size_t k = 0; k < nr_gparts;) {
662
    if (cells_top[gind[k]].nodeID != local_nodeID) {
663
      nr_gparts -= 1;
664
      /* Swap the particle */
Matthieu Schaller's avatar
Bug fix    
Matthieu Schaller committed
665
      const struct gpart tp = s->gparts[k];
666
667
      s->gparts[k] = s->gparts[nr_gparts];
      s->gparts[nr_gparts] = tp;
668
669
      /* Swap the link with part/spart */
      if (s->gparts[k].type == swift_type_gas) {
670
        s->parts[-s->gparts[k].id_or_neg_offset].gpart = &s->gparts[k];
671
672
      } else if (s->gparts[k].type == swift_type_star) {
        s->sparts[-s->gparts[k].id_or_neg_offset].gpart = &s->gparts[k];
673
      }
674
      if (s->gparts[nr_gparts].type == swift_type_gas) {
675
676
        s->parts[-s->gparts[nr_gparts].id_or_neg_offset].gpart =
            &s->gparts[nr_gparts];
677
678
679
      } else if (s->gparts[nr_gparts].type == swift_type_star) {
        s->sparts[-s->gparts[nr_gparts].id_or_neg_offset].gpart =
            &s->gparts[nr_gparts];
680
      }
681
      /* Swap the index */
Matthieu Schaller's avatar
Bug fix    
Matthieu Schaller committed
682
683
684
      const int t = gind[k];
      gind[k] = gind[nr_gparts];
      gind[nr_gparts] = t;
Matthieu Schaller's avatar
Matthieu Schaller committed
685
    } else {
686
687
688
689
      /* Increment when not exchanging otherwise we need to retest "k".*/
      k++;
    }
  }
690

691
#ifdef SWIFT_DEBUG_CHECKS
692
693
  /* Check that all gparts are in the correct place (untested). */
  for (size_t k = 0; k < nr_gparts; k++) {
694
    if (cells_top[gind[k]].nodeID != local_nodeID) {
695
696
697
698
      error("Failed to move all non-local gparts to send list");
    }
  }
  for (size_t k = nr_gparts; k < s->nr_gparts; k++) {
699
    if (cells_top[gind[k]].nodeID == local_nodeID) {
700
      error("Failed to remove local gparts from send list");
701
    }
702
703
  }
#endif
704

705
706
  /* Exchange the strays, note that this potentially re-allocates
     the parts arrays. */
707
  size_t nr_parts_exchanged = s->nr_parts - nr_parts;
708
  size_t nr_gparts_exchanged = s->nr_gparts - nr_gparts;
709
  size_t nr_sparts_exchanged = s->nr_sparts - nr_sparts;
Pedro Gonnet's avatar
Pedro Gonnet committed
710
  engine_exchange_strays(s->e, nr_parts, &ind[nr_parts], &nr_parts_exchanged,
711
712
                         nr_gparts, &gind[nr_gparts], &nr_gparts_exchanged,
                         nr_sparts, &sind[nr_sparts], &nr_sparts_exchanged);
Pedro Gonnet's avatar
Pedro Gonnet committed
713
714

  /* Set the new particle counts. */
715
  s->nr_parts = nr_parts + nr_parts_exchanged;
716
  s->nr_gparts = nr_gparts + nr_gparts_exchanged;
717
  s->nr_sparts = nr_sparts + nr_sparts_exchanged;
718

719
  /* Re-allocate the index array for the parts if needed.. */
720
  if (s->nr_parts + 1 > ind_size) {
721
    int *ind_new;
722
    if ((ind_new = (int *)malloc(sizeof(int) * (s->nr_parts + 1))) == NULL)
723
      error("Failed to allocate temporary particle indices.");
724
    memcpy(ind_new, ind, sizeof(int) * nr_parts);
725
726
    free(ind);
    ind = ind_new;
727
728
  }

729
  /* Re-allocate the index array for the sparts if needed.. */
730
  if (s->nr_sparts + 1 > sind_size) {
731
732
    int *sind_new;
    if ((sind_new = (int *)malloc(sizeof(int) * (s->nr_sparts + 1))) == NULL)
733
      error("Failed to allocate temporary s-particle indices.");
734
735
736
737
738
    memcpy(sind_new, sind, sizeof(int) * nr_sparts);
    free(sind);
    sind = sind_new;
  }

739
740
741
  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]};

742
  /* Assign each received part to its cell. */
Pedro Gonnet's avatar
Pedro Gonnet committed
743
  for (size_t k = nr_parts; k < s->nr_parts; k++) {
Matthieu Schaller's avatar
Matthieu Schaller committed
744
    const struct part *const p = &s->parts[k];
745
    ind[k] =
746
        cell_getid(cdim, p->x[0] * ih[0], p->x[1] * ih[1], p->x[2] * ih[2]);
747
#ifdef SWIFT_DEBUG_CHECKS
748
    if (cells_top[ind[k]].nodeID != local_nodeID)
749
      error("Received part that does not belong to me (nodeID=%i).",
750
            cells_top[ind[k]].nodeID);
751
#endif
752
  }
753
  nr_parts = s->nr_parts;
754

755
  /* Assign each received spart to its cell. */
756
757
758
759
760
761
  for (size_t k = nr_sparts; k < s->nr_sparts; k++) {
    const struct spart *const sp = &s->sparts[k];
    sind[k] =
        cell_getid(cdim, sp->x[0] * ih[0], sp->x[1] * ih[1], sp->x[2] * ih[2]);
#ifdef SWIFT_DEBUG_CHECKS
    if (cells_top[sind[k]].nodeID != local_nodeID)
762
      error("Received s-part that does not belong to me (nodeID=%i).",
763
764
765
766
767
            cells_top[sind[k]].nodeID);
#endif
  }
  nr_sparts = s->nr_sparts;

768
#endif /* WITH_MPI */
769
770

  /* Sort the parts according to their cells. */
771
772
  if (nr_parts > 0)
    space_parts_sort(s, ind, nr_parts, 0, s->nr_cells - 1, verbose);
773

774
775
776
#ifdef SWIFT_DEBUG_CHECKS
  /* Verify that the part have been sorted correctly. */
  for (size_t k = 0; k < nr_parts; k++) {
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
    const struct part *p = &s->parts[k];

    /* New cell index */
    const int new_ind =
        cell_getid(s->cdim, p->x[0] * s->iwidth[0], p->x[1] * s->iwidth[1],
                   p->x[2] * s->iwidth[2]);

    /* New cell of this part */
    const struct cell *c = &s->cells_top[new_ind];

    if (ind[k] != new_ind)
      error("part's new cell index not matching sorted index.");

    if (p->x[0] < c->loc[0] || p->x[0] > c->loc[0] + c->width[0] ||
        p->x[1] < c->loc[1] || p->x[1] > c->loc[1] + c->width[1] ||
        p->x[2] < c->loc[2] || p->x[2] > c->loc[2] + c->width[2])
793
794
795
796
      error("part not sorted into the right top-level cell!");
  }
#endif

797
798
799
800
  /* Sort the sparts according to their cells. */
  if (nr_sparts > 0)
    space_sparts_sort(s, sind, nr_sparts, 0, s->nr_cells - 1, verbose);

801
802
803
#ifdef SWIFT_DEBUG_CHECKS
  /* Verify that the spart have been sorted correctly. */
  for (size_t k = 0; k < nr_sparts; k++) {
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
    const struct spart *sp = &s->sparts[k];

    /* New cell index */
    const int new_sind =
        cell_getid(s->cdim, sp->x[0] * s->iwidth[0], sp->x[1] * s->iwidth[1],
                   sp->x[2] * s->iwidth[2]);

    /* New cell of this spart */
    const struct cell *c = &s->cells_top[new_sind];

    if (sind[k] != new_sind)
      error("spart's new cell index not matching sorted index.");

    if (sp->x[0] < c->loc[0] || sp->x[0] > c->loc[0] + c->width[0] ||
        sp->x[1] < c->loc[1] || sp->x[1] > c->loc[1] + c->width[1] ||
        sp->x[2] < c->loc[2] || sp->x[2] > c->loc[2] + c->width[2])
820
821
822
823
      error("spart not sorted into the right top-level cell!");
  }
#endif

824
825
826
827
828
  /* Re-link the gparts to their (s-)particles. */
  if (nr_parts > 0 && nr_gparts > 0)
    part_relink_gparts_to_parts(s->parts, nr_parts, 0);
  if (nr_sparts > 0 && nr_gparts > 0)
    part_relink_gparts_to_sparts(s->sparts, nr_sparts, 0);
829

830
831
832
833
834
835
836
837
838
839
  /* 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;
    }
  }

840
841
  /* Extract the cell counts from the sorted indices. */
  size_t last_sindex = 0;
842
  sind[nr_sparts] = s->nr_cells;  // sentinel.
843
844
845
846
847
848
849
  for (size_t k = 0; k < nr_sparts; k++) {
    if (sind[k] < sind[k + 1]) {
      cells_top[sind[k]].scount = k - last_sindex + 1;
      last_sindex = k + 1;
    }
  }

850
  /* We no longer need the indices as of here. */
851
  free(ind);
852
  free(sind);
853

854
855
#ifdef WITH_MPI

856
  /* Re-allocate the index array for the gparts if needed.. */
857
  if (s->nr_gparts + 1 > gind_size) {
858
    int *gind_new;
859
    if ((gind_new = (int *)malloc(sizeof(int) * (s->nr_gparts + 1))) == NULL)
860
      error("Failed to allocate temporary g-particle indices.");
861
    memcpy(gind_new, gind, sizeof(int) * nr_gparts);
862
863
864
865
    free(gind);
    gind = gind_new;
  }

866
  /* Assign each received gpart to its cell. */
867
  for (size_t k = nr_gparts; k < s->nr_gparts; k++) {
Matthieu Schaller's avatar
Matthieu Schaller committed
868
    const struct gpart *const p = &s->gparts[k];
869
870
    gind[k] =
        cell_getid(cdim, p->x[0] * ih[0], p->x[1] * ih[1], p->x[2] * ih[2]);
871
872

#ifdef SWIFT_DEBUG_CHECKS
873
    if (cells_top[gind[k]].nodeID != s->e->nodeID)
874
      error("Received g-part that does not belong to me (nodeID=%i).",
875
            cells_top[gind[k]].nodeID);
876
#endif
877
878
879
  }
  nr_gparts = s->nr_gparts;

880
#endif /* WITH_MPI */
881

882
  /* Sort the gparts according to their cells. */
883
884
  if (nr_gparts > 0)
    space_gparts_sort(s, gind, nr_gparts, 0, s->nr_cells - 1, verbose);
885

886
887
888
#ifdef SWIFT_DEBUG_CHECKS
  /* Verify that the gpart have been sorted correctly. */
  for (size_t k = 0; k < nr_gparts; k++) {
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
    const struct gpart *gp = &s->gparts[k];

    /* New cell index */
    const int new_gind =
        cell_getid(s->cdim, gp->x[0] * s->iwidth[0], gp->x[1] * s->iwidth[1],
                   gp->x[2] * s->iwidth[2]);

    /* New cell of this gpart */
    const struct cell *c = &s->cells_top[new_gind];

    if (gind[k] != new_gind)
      error("gpart's new cell index not matching sorted index.");

    if (gp->x[0] < c->loc[0] || gp->x[0] > c->loc[0] + c->width[0] ||
        gp->x[1] < c->loc[1] || gp->x[1] > c->loc[1] + c->width[1] ||
        gp->x[2] < c->loc[2] || gp->x[2] > c->loc[2] + c->width[2])
905
906
907
908
      error("gpart not sorted into the right top-level cell!");
  }
#endif

909
  /* Re-link the parts. */
910
  if (nr_parts > 0 && nr_gparts > 0)
911
912
913
914
915
    part_relink_parts_to_gparts(s->gparts, nr_gparts, s->parts);

  /* Re-link the sparts. */
  if (nr_sparts > 0 && nr_gparts > 0)
    part_relink_sparts_to_gparts(s->gparts, nr_gparts, s->sparts);
916

917
918
  /* Extract the cell counts from the sorted indices. */
  size_t last_gindex = 0;
919
  gind[nr_gparts] = s->nr_cells;
920
921
  for (size_t k = 0; k < nr_gparts; k++) {
    if (gind[k] < gind[k + 1]) {
922
      cells_top[gind[k]].gcount = k - last_gindex + 1;
923
924
925
926
      last_gindex = k + 1;
    }
  }

927
  /* We no longer need the indices as of here. */
928
  free(gind);
929

930
#ifdef SWIFT_DEBUG_CHECKS
931
  /* Verify that the links are correct */
932
933
934
  if ((nr_gparts > 0 && nr_parts >