runner.c 35.7 KB
Newer Older
1
/*******************************************************************************
2
 * This file is part of SWIFT.
3
 * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
4
5
6
7
 *                    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)
8
 *
9
10
11
12
 * 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.
13
 *
14
15
16
17
 * 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.
18
 *
19
20
 * 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/>.
21
 *
22
 ******************************************************************************/
Pedro Gonnet's avatar
Pedro Gonnet committed
23

Pedro Gonnet's avatar
Pedro Gonnet committed
24
25
/* Config parameters. */
#include "../config.h"
Pedro Gonnet's avatar
Pedro Gonnet committed
26
27
28
29

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

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

37
38
39
/* This object's header. */
#include "runner.h"

Pedro Gonnet's avatar
Pedro Gonnet committed
40
/* Local headers. */
Matthieu Schaller's avatar
Matthieu Schaller committed
41
#include "approx_math.h"
42
#include "atomic.h"
43
#include "cell.h"
44
#include "const.h"
Stefan Arridge's avatar
Stefan Arridge committed
45
#include "cooling.h"
46
#include "debug.h"
Matthieu Schaller's avatar
Matthieu Schaller committed
47
#include "drift.h"
Pedro Gonnet's avatar
Pedro Gonnet committed
48
#include "engine.h"
49
#include "error.h"
50
51
#include "gravity.h"
#include "hydro.h"
Matthieu Schaller's avatar
Matthieu Schaller committed
52
#include "hydro_properties.h"
53
#include "kick.h"
54
#include "minmax.h"
55
#include "scheduler.h"
56
#include "sourceterms.h"
57
58
59
#include "space.h"
#include "task.h"
#include "timers.h"
60
#include "timestep.h"
Pedro Gonnet's avatar
Pedro Gonnet committed
61

62
63
64
65
66
67
68
69
70
71
72
73
/**
 * @brief  Entry in a list of sorted indices.
 */
struct entry {

  /*! Distance on the axis */
  float d;

  /*! Particle index */
  int i;
};

74
/* Orientation of the cell pairs */
Matthieu Schaller's avatar
Matthieu Schaller committed
75
76
const double runner_shift[13][3] = {
    {5.773502691896258e-01, 5.773502691896258e-01, 5.773502691896258e-01},
77
    {7.071067811865475e-01, 7.071067811865475e-01, 0.0},
Matthieu Schaller's avatar
Matthieu Schaller committed
78
79
80
81
82
83
84
85
86
87
    {5.773502691896258e-01, 5.773502691896258e-01, -5.773502691896258e-01},
    {7.071067811865475e-01, 0.0, 7.071067811865475e-01},
    {1.0, 0.0, 0.0},
    {7.071067811865475e-01, 0.0, -7.071067811865475e-01},
    {5.773502691896258e-01, -5.773502691896258e-01, 5.773502691896258e-01},
    {7.071067811865475e-01, -7.071067811865475e-01, 0.0},
    {5.773502691896258e-01, -5.773502691896258e-01, -5.773502691896258e-01},
    {0.0, 7.071067811865475e-01, 7.071067811865475e-01},
    {0.0, 1.0, 0.0},
    {0.0, 7.071067811865475e-01, -7.071067811865475e-01},
88
89
    {0.0, 0.0, 1.0},
};
90
91

/* Does the axis need flipping ? */
92
93
const char runner_flip[27] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
                              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
Pedro Gonnet's avatar
Pedro Gonnet committed
94

95
/* Import the density loop functions. */
96
97
98
#define FUNCTION density
#include "runner_doiact.h"

99
/* Import the gradient loop functions (if required). */
100
101
102
103
104
105
#ifdef EXTRA_HYDRO_LOOP
#undef FUNCTION
#define FUNCTION gradient
#include "runner_doiact.h"
#endif

106
/* Import the force loop functions. */
107
108
109
110
#undef FUNCTION
#define FUNCTION force
#include "runner_doiact.h"

111
/* Import the gravity loop functions. */
112
#include "runner_doiact_fft.h"
Matthieu Schaller's avatar
Matthieu Schaller committed
113
#include "runner_doiact_grav.h"
114

Tom Theuns's avatar
Tom Theuns committed
115
/**
Tom Theuns's avatar
Tom Theuns committed
116
 * @brief Perform source terms
Tom Theuns's avatar
Tom Theuns committed
117
118
119
120
121
122
123
 *
 * @param r runner task
 * @param c cell
 * @param timer 1 if the time is to be recorded.
 */
void runner_do_sourceterms(struct runner *r, struct cell *c, int timer) {
  const int count = c->count;
124
  const double cell_min[3] = {c->loc[0], c->loc[1], c->loc[2]};
Tom Theuns's avatar
Tom Theuns committed
125
  const double cell_width[3] = {c->width[0], c->width[1], c->width[2]};
Tom Theuns's avatar
Tom Theuns committed
126
  struct sourceterms *sourceterms = r->e->sourceterms;
127
  const int dimen = 3;
Tom Theuns's avatar
Tom Theuns committed
128
129
130
131
132
133
134
135
136
137

  TIMER_TIC;

  /* Recurse? */
  if (c->split) {
    for (int k = 0; k < 8; k++)
      if (c->progeny[k] != NULL) runner_do_sourceterms(r, c->progeny[k], 0);
    return;
  }

Tom Theuns's avatar
Tom Theuns committed
138
139
140
141
142
143
144
  if (count > 0) {

    /* do sourceterms in this cell? */
    const int incell =
        sourceterms_test_cell(cell_min, cell_width, sourceterms, dimen);
    if (incell == 1) {
      sourceterms_apply(r, sourceterms, c);
Tom Theuns's avatar
Tom Theuns committed
145
146
    }
  }
Tom Theuns's avatar
Tom Theuns committed
147
148
149
150

  if (timer) TIMER_TOC(timer_dosource);
}

Tom Theuns's avatar
Tom Theuns committed
151
152
153
/**
 * @brief Calculate gravity acceleration from external potential
 *
Matthieu Schaller's avatar
Matthieu Schaller committed
154
155
156
 * @param r runner task
 * @param c cell
 * @param timer 1 if the time is to be recorded.
Tom Theuns's avatar
Tom Theuns committed
157
 */
158
void runner_do_grav_external(struct runner *r, struct cell *c, int timer) {
Tom Theuns's avatar
Tom Theuns committed
159

Matthieu Schaller's avatar
Matthieu Schaller committed
160
161
  struct gpart *restrict gparts = c->gparts;
  const int gcount = c->gcount;
162
  const int ti_current = r->e->ti_current;
Matthieu Schaller's avatar
Matthieu Schaller committed
163
  const struct external_potential *potential = r->e->external_potential;
164
  const struct phys_const *constants = r->e->physical_constants;
165
  const double time = r->e->time;
Matthieu Schaller's avatar
Matthieu Schaller committed
166

167
  TIMER_TIC;
Tom Theuns's avatar
Tom Theuns committed
168

169
170
171
  /* Anything to do here? */
  if (c->ti_end_min > ti_current) return;

Tom Theuns's avatar
Tom Theuns committed
172
173
  /* Recurse? */
  if (c->split) {
Matthieu Schaller's avatar
Matthieu Schaller committed
174
    for (int k = 0; k < 8; k++)
175
      if (c->progeny[k] != NULL) runner_do_grav_external(r, c->progeny[k], 0);
Tom Theuns's avatar
Tom Theuns committed
176
177
178
179
    return;
  }

#ifdef TASK_VERBOSE
Matthieu Schaller's avatar
Matthieu Schaller committed
180
  OUT;
Tom Theuns's avatar
Tom Theuns committed
181
#endif
Matthieu Schaller's avatar
Matthieu Schaller committed
182

183
  /* Loop over the gparts in this cell. */
Matthieu Schaller's avatar
Matthieu Schaller committed
184
  for (int i = 0; i < gcount; i++) {
185

186
    /* Get a direct pointer on the part. */
187
    struct gpart *restrict gp = &gparts[i];
188
189

    /* Is this part within the time step? */
190
    if (gp->ti_end <= ti_current) {
Matthieu Schaller's avatar
Matthieu Schaller committed
191

192
      external_gravity_acceleration(time, potential, constants, gp);
193
    }
194
  }
Matthieu Schaller's avatar
Matthieu Schaller committed
195

196
  if (timer) TIMER_TOC(timer_dograv_external);
Tom Theuns's avatar
Tom Theuns committed
197
198
}

Stefan Arridge's avatar
Stefan Arridge committed
199
/**
200
201
 * @brief Calculate change in thermal state of particles induced
 * by radiative cooling and heating.
Stefan Arridge's avatar
Stefan Arridge committed
202
203
204
205
206
207
208
209
 *
 * @param r runner task
 * @param c cell
 * @param timer 1 if the time is to be recorded.
 */
void runner_do_cooling(struct runner *r, struct cell *c, int timer) {

  struct part *restrict parts = c->parts;
210
  struct xpart *restrict xparts = c->xparts;
Stefan Arridge's avatar
Stefan Arridge committed
211
212
  const int count = c->count;
  const int ti_current = r->e->ti_current;
213
  const struct cooling_function_data *cooling_func = r->e->cooling_func;
Stefan Arridge's avatar
Stefan Arridge committed
214
  const struct phys_const *constants = r->e->physical_constants;
215
  const struct UnitSystem *us = r->e->internalUnits;
Stefan Arridge's avatar
Stefan Arridge committed
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
  const double timeBase = r->e->timeBase;

  TIMER_TIC;

  /* Recurse? */
  if (c->split) {
    for (int k = 0; k < 8; k++)
      if (c->progeny[k] != NULL) runner_do_cooling(r, c->progeny[k], 0);
    return;
  }

#ifdef TASK_VERBOSE
  OUT;
#endif

Stefan Arridge's avatar
Stefan Arridge committed
231
  /* Loop over the parts in this cell. */
Stefan Arridge's avatar
Stefan Arridge committed
232
233
234
235
  for (int i = 0; i < count; i++) {

    /* Get a direct pointer on the part. */
    struct part *restrict p = &parts[i];
236
    struct xpart *restrict xp = &xparts[i];
Stefan Arridge's avatar
Stefan Arridge committed
237

Stefan Arridge's avatar
Stefan Arridge committed
238
239
    /* Kick has already updated ti_end, so need to check ti_begin */
    if (p->ti_begin == ti_current) {
240
241
242

      const double dt = (p->ti_end - p->ti_begin) * timeBase;

243
      cooling_cool_part(constants, us, cooling_func, p, xp, dt);
Stefan Arridge's avatar
Stefan Arridge committed
244
245
246
247
248
249
    }
  }

  if (timer) TIMER_TOC(timer_do_cooling);
}

Pedro Gonnet's avatar
Pedro Gonnet committed
250
251
252
253
254
255
/**
 * @brief Sort the entries in ascending order using QuickSort.
 *
 * @param sort The entries
 * @param N The number of entries.
 */
256
void runner_do_sort_ascending(struct entry *sort, int N) {
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310

  struct {
    short int lo, hi;
  } qstack[10];
  int qpos, i, j, lo, hi, imin;
  struct entry temp;
  float pivot;

  /* Sort parts in cell_i in decreasing order with quicksort */
  qstack[0].lo = 0;
  qstack[0].hi = N - 1;
  qpos = 0;
  while (qpos >= 0) {
    lo = qstack[qpos].lo;
    hi = qstack[qpos].hi;
    qpos -= 1;
    if (hi - lo < 15) {
      for (i = lo; i < hi; i++) {
        imin = i;
        for (j = i + 1; j <= hi; j++)
          if (sort[j].d < sort[imin].d) imin = j;
        if (imin != i) {
          temp = sort[imin];
          sort[imin] = sort[i];
          sort[i] = temp;
        }
      }
    } else {
      pivot = sort[(lo + hi) / 2].d;
      i = lo;
      j = hi;
      while (i <= j) {
        while (sort[i].d < pivot) i++;
        while (sort[j].d > pivot) j--;
        if (i <= j) {
          if (i < j) {
            temp = sort[i];
            sort[i] = sort[j];
            sort[j] = temp;
          }
          i += 1;
          j -= 1;
        }
      }
      if (j > (lo + hi) / 2) {
        if (lo < j) {
          qpos += 1;
          qstack[qpos].lo = lo;
          qstack[qpos].hi = j;
        }
        if (i < hi) {
          qpos += 1;
          qstack[qpos].lo = i;
          qstack[qpos].hi = hi;
Pedro Gonnet's avatar
Pedro Gonnet committed
311
        }
312
313
314
315
316
317
318
319
320
321
322
323
      } else {
        if (i < hi) {
          qpos += 1;
          qstack[qpos].lo = i;
          qstack[qpos].hi = hi;
        }
        if (lo < j) {
          qpos += 1;
          qstack[qpos].lo = lo;
          qstack[qpos].hi = j;
        }
      }
Pedro Gonnet's avatar
Pedro Gonnet committed
324
    }
325
326
327
  }
}

Pedro Gonnet's avatar
Pedro Gonnet committed
328
329
330
331
332
/**
 * @brief Sort the particles in the given cell along all cardinal directions.
 *
 * @param r The #runner.
 * @param c The #cell.
333
 * @param flags Cell flag.
334
335
 * @param clock Flag indicating whether to record the timing or not, needed
 *      for recursive calls.
Pedro Gonnet's avatar
Pedro Gonnet committed
336
 */
337
void runner_do_sort(struct runner *r, struct cell *c, int flags, int clock) {
338
339
340
341
342
343
344

  struct entry *finger;
  struct entry *fingers[8];
  struct part *parts = c->parts;
  struct entry *sort;
  int j, k, count = c->count;
  int i, ind, off[8], inds[8], temp_i, missing;
Matthieu Schaller's avatar
Matthieu Schaller committed
345
346
  float buff[8];
  double px[3];
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370

  TIMER_TIC

  /* Clean-up the flags, i.e. filter out what's already been sorted. */
  flags &= ~c->sorted;
  if (flags == 0) return;

  /* start by allocating the entry arrays. */
  if (c->sort == NULL || c->sortsize < count) {
    if (c->sort != NULL) free(c->sort);
    c->sortsize = count * 1.1;
    if ((c->sort = (struct entry *)malloc(sizeof(struct entry) *
                                          (c->sortsize + 1) * 13)) == NULL)
      error("Failed to allocate sort memory.");
  }
  sort = c->sort;

  /* Does this cell have any progeny? */
  if (c->split) {

    /* Fill in the gaps within the progeny. */
    for (k = 0; k < 8; k++) {
      if (c->progeny[k] == NULL) continue;
      missing = flags & ~c->progeny[k]->sorted;
371
      if (missing) runner_do_sort(r, c->progeny[k], missing, 0);
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
    }

    /* Loop over the 13 different sort arrays. */
    for (j = 0; j < 13; j++) {

      /* Has this sort array been flagged? */
      if (!(flags & (1 << j))) continue;

      /* Init the particle index offsets. */
      for (off[0] = 0, k = 1; k < 8; k++)
        if (c->progeny[k - 1] != NULL)
          off[k] = off[k - 1] + c->progeny[k - 1]->count;
        else
          off[k] = off[k - 1];

      /* Init the entries and indices. */
      for (k = 0; k < 8; k++) {
        inds[k] = k;
        if (c->progeny[k] != NULL && c->progeny[k]->count > 0) {
          fingers[k] = &c->progeny[k]->sort[j * (c->progeny[k]->count + 1)];
          buff[k] = fingers[k]->d;
          off[k] = off[k];
        } else
          buff[k] = FLT_MAX;
      }

      /* Sort the buffer. */
      for (i = 0; i < 7; i++)
        for (k = i + 1; k < 8; k++)
          if (buff[inds[k]] < buff[inds[i]]) {
            temp_i = inds[i];
            inds[i] = inds[k];
            inds[k] = temp_i;
          }

      /* For each entry in the new sort list. */
      finger = &sort[j * (count + 1)];
      for (ind = 0; ind < count; ind++) {

        /* Copy the minimum into the new sort array. */
        finger[ind].d = buff[inds[0]];
        finger[ind].i = fingers[inds[0]]->i + off[inds[0]];

        /* Update the buffer. */
        fingers[inds[0]] += 1;
        buff[inds[0]] = fingers[inds[0]]->d;

        /* Find the smallest entry. */
        for (k = 1; k < 8 && buff[inds[k]] < buff[inds[k - 1]]; k++) {
          temp_i = inds[k - 1];
          inds[k - 1] = inds[k];
          inds[k] = temp_i;
Pedro Gonnet's avatar
Pedro Gonnet committed
424
        }
425

426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
      } /* Merge. */

      /* Add a sentinel. */
      sort[j * (count + 1) + count].d = FLT_MAX;
      sort[j * (count + 1) + count].i = 0;

      /* Mark as sorted. */
      c->sorted |= (1 << j);

    } /* loop over sort arrays. */

  } /* progeny? */

  /* Otherwise, just sort. */
  else {

    /* Fill the sort array. */
    for (k = 0; k < count; k++) {
      px[0] = parts[k].x[0];
      px[1] = parts[k].x[1];
      px[2] = parts[k].x[2];
      for (j = 0; j < 13; j++)
        if (flags & (1 << j)) {
          sort[j * (count + 1) + k].i = k;
Matthieu Schaller's avatar
Matthieu Schaller committed
450
451
452
          sort[j * (count + 1) + k].d = px[0] * runner_shift[j][0] +
                                        px[1] * runner_shift[j][1] +
                                        px[2] * runner_shift[j][2];
453
        }
454
    }
455
456
457
458
459
460

    /* Add the sentinel and sort. */
    for (j = 0; j < 13; j++)
      if (flags & (1 << j)) {
        sort[j * (count + 1) + count].d = FLT_MAX;
        sort[j * (count + 1) + count].i = 0;
461
        runner_do_sort_ascending(&sort[j * (count + 1)], count);
462
463
464
465
        c->sorted |= (1 << j);
      }
  }

466
#ifdef SWIFT_DEBUG_CHECKS
Matthieu Schaller's avatar
Matthieu Schaller committed
467
  /* Verify the sorting. */
468
469
470
471
472
473
474
475
476
477
  for (j = 0; j < 13; j++) {
    if (!(flags & (1 << j))) continue;
    finger = &sort[j * (count + 1)];
    for (k = 1; k < count; k++) {
      if (finger[k].d < finger[k - 1].d)
        error("Sorting failed, ascending array.");
      if (finger[k].i >= count) error("Sorting failed, indices borked.");
    }
  }
#endif
478
479
480
481

  if (clock) TIMER_TOC(timer_dosort);
}

482
483
484
485
486
/**
 * @brief Initialize the particles before the density calculation
 *
 * @param r The runner thread.
 * @param c The cell.
Matthieu Schaller's avatar
Matthieu Schaller committed
487
 * @param timer 1 if the time is to be recorded.
488
 */
489
void runner_do_init(struct runner *r, struct cell *c, int timer) {
490

Matthieu Schaller's avatar
Matthieu Schaller committed
491
492
  struct part *restrict parts = c->parts;
  struct gpart *restrict gparts = c->gparts;
Matthieu Schaller's avatar
Matthieu Schaller committed
493
  const int count = c->count;
494
  const int gcount = c->gcount;
495
  const int ti_current = r->e->ti_current;
496
497

  TIMER_TIC;
498

499
500
501
  /* Anything to do here? */
  if (c->ti_end_min > ti_current) return;

502
503
  /* Recurse? */
  if (c->split) {
Matthieu Schaller's avatar
Matthieu Schaller committed
504
    for (int k = 0; k < 8; k++)
505
      if (c->progeny[k] != NULL) runner_do_init(r, c->progeny[k], 0);
506
    return;
507
508
  } else {

509
510
    /* Loop over the parts in this cell. */
    for (int i = 0; i < count; i++) {
511

512
      /* Get a direct pointer on the part. */
513
      struct part *restrict p = &parts[i];
514

515
      if (p->ti_end <= ti_current) {
Matthieu Schaller's avatar
Matthieu Schaller committed
516

517
518
        /* Get ready for a density calculation */
        hydro_init_part(p);
519
      }
520
    }
521
522
523
524
525

    /* Loop over the gparts in this cell. */
    for (int i = 0; i < gcount; i++) {

      /* Get a direct pointer on the part. */
526
      struct gpart *restrict gp = &gparts[i];
527
528
529
530

      if (gp->ti_end <= ti_current) {

        /* Get ready for a density calculation */
531
        gravity_init_gpart(gp);
532
533
      }
    }
534
  }
535

Peter W. Draper's avatar
Peter W. Draper committed
536
  if (timer) TIMER_TOC(timer_init);
537
538
}

539
/**
540
541
542
543
544
545
546
 * @brief Intermediate task after the gradient loop that does final operations
 * on the gradient quantities and optionally slope limits the gradients
 *
 * @param r The runner thread.
 * @param c The cell.
 */
void runner_do_extra_ghost(struct runner *r, struct cell *c) {
547

548
#ifdef EXTRA_HYDRO_LOOP
549

550
551
552
553
  struct part *restrict parts = c->parts;
  const int count = c->count;
  const int ti_current = r->e->ti_current;

554
555
556
  /* Anything to do here? */
  if (c->ti_end_min > ti_current) return;

557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
  /* Recurse? */
  if (c->split) {
    for (int k = 0; k < 8; k++)
      if (c->progeny[k] != NULL) runner_do_extra_ghost(r, c->progeny[k]);
    return;
  } else {

    /* Loop over the parts in this cell. */
    for (int i = 0; i < count; i++) {

      /* Get a direct pointer on the part. */
      struct part *restrict p = &parts[i];

      if (p->ti_end <= ti_current) {

        /* Get ready for a force calculation */
        hydro_end_gradient(p);
      }
    }
  }
577
578
579

#else
  error("SWIFT was not compiled with the extra hydro loop activated.");
580
#endif
581
}
582

583
/**
584
585
 * @brief Intermediate task after the density to check that the smoothing
 * lengths are correct.
586
 *
Pedro Gonnet's avatar
Pedro Gonnet committed
587
 * @param r The runner thread.
588
 * @param c The cell.
589
 */
Matthieu Schaller's avatar
Matthieu Schaller committed
590
void runner_do_ghost(struct runner *r, struct cell *c) {
591

Matthieu Schaller's avatar
Matthieu Schaller committed
592
593
  struct part *restrict parts = c->parts;
  struct xpart *restrict xparts = c->xparts;
Matthieu Schaller's avatar
Matthieu Schaller committed
594
  int redo, count = c->count;
595
596
  const int ti_current = r->e->ti_current;
  const double timeBase = r->e->timeBase;
597
598
599
600
601
602
603
  const float target_wcount = r->e->hydro_properties->target_neighbours;
  const float max_wcount =
      target_wcount + r->e->hydro_properties->delta_neighbours;
  const float min_wcount =
      target_wcount - r->e->hydro_properties->delta_neighbours;
  const int max_smoothing_iter =
      r->e->hydro_properties->max_smoothing_iterations;
604

605
606
  TIMER_TIC;

607
608
609
  /* Anything to do here? */
  if (c->ti_end_min > ti_current) return;

610
611
  /* Recurse? */
  if (c->split) {
Matthieu Schaller's avatar
Matthieu Schaller committed
612
    for (int k = 0; k < 8; k++)
Matthieu Schaller's avatar
Matthieu Schaller committed
613
      if (c->progeny[k] != NULL) runner_do_ghost(r, c->progeny[k]);
614
615
616
617
    return;
  }

  /* Init the IDs that have to be updated. */
618
619
620
  int *pid = NULL;
  if ((pid = malloc(sizeof(int) * count)) == NULL)
    error("Can't allocate memory for pid.");
Matthieu Schaller's avatar
Matthieu Schaller committed
621
  for (int k = 0; k < count; k++) pid[k] = k;
622
623

  /* While there are particles that need to be updated... */
624
  for (int num_reruns = 0; count > 0 && num_reruns < max_smoothing_iter;
Matthieu Schaller's avatar
Matthieu Schaller committed
625
       num_reruns++) {
626
627
628

    /* Reset the redo-count. */
    redo = 0;
629

630
    /* Loop over the parts in this cell. */
Matthieu Schaller's avatar
Matthieu Schaller committed
631
    for (int i = 0; i < count; i++) {
632
633

      /* Get a direct pointer on the part. */
634
635
      struct part *restrict p = &parts[pid[i]];
      struct xpart *restrict xp = &xparts[pid[i]];
636
637

      /* Is this part within the timestep? */
638
      if (p->ti_end <= ti_current) {
639

640
        /* Finish the density calculation */
641
        hydro_end_density(p, ti_current);
642

Matthieu Schaller's avatar
Matthieu Schaller committed
643
644
        float h_corr = 0.f;

645
        /* If no derivative, double the smoothing length. */
646
        if (p->density.wcount_dh == 0.0f) h_corr = p->h;
647
648
649

        /* Otherwise, compute the smoothing length update (Newton step). */
        else {
650
          h_corr = (target_wcount - p->density.wcount) / p->density.wcount_dh;
651
652

          /* Truncate to the range [ -p->h/2 , p->h ]. */
653
654
          h_corr = (h_corr < p->h) ? h_corr : p->h;
          h_corr = (h_corr > -0.5f * p->h) ? h_corr : -0.5f * p->h;
Pedro Gonnet's avatar
Pedro Gonnet committed
655
        }
656
657

        /* Did we get the right number density? */
658
        if (p->density.wcount > max_wcount || p->density.wcount < min_wcount) {
659
660
661
662

          /* Ok, correct then */
          p->h += h_corr;

663
          /* Flag for another round of fun */
664
665
          pid[redo] = pid[i];
          redo += 1;
666

667
668
          /* Re-initialise everything */
          hydro_init_part(p);
669

670
          /* Off we go ! */
671
          continue;
672
673
        }

Matthieu Schaller's avatar
Matthieu Schaller committed
674
        /* We now have a particle whose smoothing length has converged */
Matthieu Schaller's avatar
Matthieu Schaller committed
675

676
        /* As of here, particle force variables will be set. */
677

678
        /* Compute variables required for the force loop */
679
        hydro_prepare_force(p, xp, ti_current, timeBase);
680

Matthieu Schaller's avatar
Matthieu Schaller committed
681
        /* The particle force values are now set.  Do _NOT_
682
           try to read any particle density variables! */
Matthieu Schaller's avatar
Matthieu Schaller committed
683

684
685
        /* Prepare the particle for the force loop over neighbours */
        hydro_reset_acceleration(p);
686
687
688
      }
    }

689
690
691
    /* We now need to treat the particles whose smoothing length had not
     * converged again */

692
693
694
695
696
    /* Re-set the counter for the next loop (potentially). */
    count = redo;
    if (count > 0) {

      /* Climb up the cell hierarchy. */
Matthieu Schaller's avatar
Matthieu Schaller committed
697
      for (struct cell *finger = c; finger != NULL; finger = finger->parent) {
Matthieu Schaller's avatar
Matthieu Schaller committed
698

699
700
        /* Run through this cell's density interactions. */
        for (struct link *l = finger->density; l != NULL; l = l->next) {
Matthieu Schaller's avatar
Matthieu Schaller committed
701

702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
          /* Self-interaction? */
          if (l->t->type == task_type_self)
            runner_doself_subset_density(r, finger, parts, pid, count);

          /* Otherwise, pair interaction? */
          else if (l->t->type == task_type_pair) {

            /* Left or right? */
            if (l->t->ci == finger)
              runner_dopair_subset_density(r, finger, parts, pid, count,
                                           l->t->cj);
            else
              runner_dopair_subset_density(r, finger, parts, pid, count,
                                           l->t->ci);

          }

719
720
721
722
723
724
725
          /* Otherwise, sub-self interaction? */
          else if (l->t->type == task_type_sub_self)
            runner_dosub_subset_density(r, finger, parts, pid, count, NULL, -1,
                                        1);

          /* Otherwise, sub-pair interaction? */
          else if (l->t->type == task_type_sub_pair) {
726
727
728
729
730
731
732
733
734
735
736

            /* Left or right? */
            if (l->t->ci == finger)
              runner_dosub_subset_density(r, finger, parts, pid, count,
                                          l->t->cj, -1, 1);
            else
              runner_dosub_subset_density(r, finger, parts, pid, count,
                                          l->t->ci, -1, 1);
          }
        }
      }
737
    }
738
  }
739

Matthieu Schaller's avatar
Matthieu Schaller committed
740
741
  if (count)
    message("Smoothing length failed to converge on %i particles.", count);
742

743
744
745
  /* Be clean */
  free(pid);

Matthieu Schaller's avatar
Matthieu Schaller committed
746
  TIMER_TOC(timer_do_ghost);
747
748
}

749
/**
Peter W. Draper's avatar
Peter W. Draper committed
750
751
 * @brief Drift particles and g-particles in a cell forward in time,
 *              unskipping any tasks associated with active cells.
752
753
 *
 * @param c The cell.
754
 * @param e The engine.
Peter W. Draper's avatar
Peter W. Draper committed
755
756
 * @param drift whether to actually drift the particles, will not be
 *              necessary for non-local cells.
757
 */
758
static void runner_do_drift(struct cell *c, struct engine *e, int drift) {
759

760
  const int ti_current = e->ti_current;
761

762
763
  /* Unskip any active tasks. */
  if (c->ti_end_min == e->ti_current) {
764
    const int forcerebuild = cell_unskip_tasks(c, &e->sched);
765
766
767
768
769
    if (forcerebuild) atomic_inc(&e->forcerebuild);
  }

  /* Do we really need to drift? */
  if (drift) {
770
    if (!e->drift_all && !cell_is_drift_needed(c, ti_current)) return;
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
  } else {

    /* Not drifting, but may still need to recurse for task skipping. */
    if (c->split) {
      for (int k = 0; k < 8; k++) {
        if (c->progeny[k] != NULL) {
          struct cell *cp = c->progeny[k];
          runner_do_drift(cp, e, 0);
        }
      }
    }
    return;
  }

  const double timeBase = e->timeBase;
  const int ti_old = c->ti_old;
  struct part *const parts = c->parts;
  struct xpart *const xparts = c->xparts;
  struct gpart *const gparts = c->gparts;
790
791
792
793

  /* Drift from the last time the cell was drifted to the current time */
  const double dt = (ti_current - ti_old) * timeBase;
  float dx_max = 0.f, dx2_max = 0.f, h_max = 0.f;
794

795
796
  /* No children? */
  if (!c->split) {
797

798
799
    /* Check that we are actually going to move forward. */
    if (ti_current >= ti_old) {
Peter W. Draper's avatar
Peter W. Draper committed
800

801
802
803
      /* Loop over all the g-particles in the cell */
      const size_t nr_gparts = c->gcount;
      for (size_t k = 0; k < nr_gparts; k++) {
804

805
806
        /* Get a handle on the gpart. */
        struct gpart *const gp = &gparts[k];
807

808
809
        /* Drift... */
        drift_gpart(gp, dt, timeBase, ti_old, ti_current);
810

811
812
        /* Compute (square of) motion since last cell construction */
        const float dx2 = gp->x_diff[0] * gp->x_diff[0] +
813
814
                          gp->x_diff[1] * gp->x_diff[1] +
                          gp->x_diff[2] * gp->x_diff[2];
815
816
        dx2_max = (dx2_max > dx2) ? dx2_max : dx2;
      }
817

818
      /* Loop over all the particles in the cell */
819
820
      const size_t nr_parts = c->count;
      for (size_t k = 0; k < nr_parts; k++) {
821

822
823
824
        /* Get a handle on the part. */
        struct part *const p = &parts[k];
        struct xpart *const xp = &xparts[k];
825

826
827
        /* Drift... */
        drift_part(p, xp, dt, timeBase, ti_old, ti_current);
Matthieu Schaller's avatar
Matthieu Schaller committed
828

829
830
        /* Compute (square of) motion since last cell construction */
        const float dx2 = xp->x_diff[0] * xp->x_diff[0] +
831
832
                          xp->x_diff[1] * xp->x_diff[1] +
                          xp->x_diff[2] * xp->x_diff[2];
833
        dx2_max = (dx2_max > dx2) ? dx2_max : dx2;
834

835
836
837
        /* Maximal smoothing length */
        h_max = (h_max > p->h) ? h_max : p->h;
      }
838

839
840
      /* Now, get the maximal particle motion from its square */
      dx_max = sqrtf(dx2_max);
841

842
    } /* Check that we are actually going to move forward. */
843
  }
844

Matthieu Schaller's avatar
Matthieu Schaller committed
845
846
847
  /* Otherwise, aggregate data from children. */
  else {

848
    /* Loop over the progeny and collect their data. */
Matthieu Schaller's avatar
Matthieu Schaller committed
849
850
    for (int k = 0; k < 8; k++)
      if (c->progeny[k] != NULL) {
851
        struct cell *cp = c->progeny[k];
852

853
        /* Recurse. */
854
        runner_do_drift(cp, e, drift);
855
856
        dx_max = max(dx_max, cp->dx_max);
        h_max = max(h_max, cp->h_max);
Matthieu Schaller's avatar
Matthieu Schaller committed
857
858
859
860
      }
  }

  /* Store the values */
861
862
863
864
865
  c->h_max = h_max;
  c->dx_max = dx_max;

  /* Update the time of the last drift */
  c->ti_old = ti_current;
866
}
867

868
869
870
871
872
873
874
875
876
877
/**
 * @brief Mapper function to drift particles and g-particles forward in time.
 *
 * @param map_data An array of #cell%s.
 * @param num_elements Chunk size.
 * @param extra_data Pointer to an #engine.
 */

void runner_do_drift_mapper(void *map_data, int num_elements,
                            void *extra_data) {
878

879
880
881
882
883
  struct engine *e = (struct engine *)extra_data;
  struct cell *cells = (struct cell *)map_data;

  for (int ind = 0; ind < num_elements; ind++) {
    struct cell *c = &cells[ind];
884
#ifdef WITH_MPI
885
    if (c != NULL) runner_do_drift(c, e, (c->nodeID == e->nodeID));
886
887
888
#else
    if (c != NULL) runner_do_drift(c, e, 1);
#endif
889
  }
890
}
891

Matthieu Schaller's avatar
Matthieu Schaller committed
892
893
894
/**
 * @brief Kick particles in momentum space and collect statistics (floating
 * time-step case)
895
896
897
 *
 * @param r The runner thread.
 * @param c The cell.
898
 * @param timer Are we timing this ?
899
 */
900
void runner_do_kick(struct runner *r, struct cell *c, int timer) {
901

902
903
  const struct engine *e = r->e;
  const double timeBase = e->timeBase;
904
  const int ti_current = r->e->ti_current;
Matthieu Schaller's avatar
Matthieu Schaller committed
905
  const int count = c->count;
906
  const int gcount = c->gcount;
Matthieu Schaller's avatar
Matthieu Schaller committed
907
908
909
  struct part *restrict parts = c->parts;
  struct xpart *restrict xparts = c->xparts;
  struct gpart *restrict gparts = c->gparts;
Matthieu Schaller's avatar
Matthieu Schaller committed
910
  const double const_G = r->e->physical_constants->const_newton_G;
Matthieu Schaller's avatar
Matthieu Schaller committed
911

912
  TIMER_TIC;
913

914
915
916
917
918
919
  /* Anything to do here? */
  if (c->ti_end_min > ti_current) {
    c->updated = 0;
    c->g_updated = 0;
    return;
  }
920

Tom Theuns's avatar
Tom Theuns committed
921
#ifdef TASK_VERBOSE
Matthieu Schaller's avatar
Matthieu Schaller committed
922
  OUT;
Tom Theuns's avatar
Tom Theuns committed
923
924
#endif

925
926
927
  int updated = 0, g_updated = 0;
  int ti_end_min = max_nr_timesteps, ti_end_max = 0;

928
929
930
  /* No children? */
  if (!c->split) {

931
932
933
934
    /* Loop over the g-particles and kick the active ones. */
    for (int k = 0; k < gcount; k++) {

      /* Get a handle on the part. */
935
      struct gpart *restrict gp = &gparts[k];
936
937

      /* If the g-particle has no counterpart and needs to be kicked */
938
      if (gp->id_or_neg_offset > 0) {
939

Matthieu Schaller's avatar
Matthieu Schaller committed
940
        if (gp->ti_end <= ti_current) {
941

Matthieu Schaller's avatar
Matthieu Schaller committed
942
          /* First, finish the force calculation */
Matthieu Schaller's avatar
Matthieu Schaller committed
943
          gravity_end_force(gp, const_G);
944

945
          /* Compute the next timestep */
946
          const int new_dti = get_gpart_timestep(gp, e);
947

Matthieu Schaller's avatar
Matthieu Schaller committed
948
          /* Now we have a time step, proceed with the kick */
949
          kick_gpart(gp, new_dti, timeBase);
Matthieu Schaller's avatar
Matthieu Schaller committed
950
951
952
953
954
955
956
957

          /* Number of updated g-particles */
          g_updated++;
        }

        /* Minimal time for next end of time-step */
        ti_end_min = min(gp->ti_end, ti_end_min);
        ti_end_max = max(gp->ti_end, ti_end_max);
958
959
960
961
962
      }
    }

    /* Now do the hydro ones... */

963
    /* Loop over the particles and kick the active ones. */
Matthieu Schaller's avatar
Matthieu Schaller committed
964
    for (int k = 0; k < count; k++) {
965
966

      /* Get a handle on the part. */
967
968
      struct part *restrict p = &parts[k];
      struct xpart *restrict xp = &xparts[k];
969
970

      /* If particle needs to be kicked */
Matthieu Schaller's avatar
Matthieu Schaller committed
971
      if (p->ti_end <= ti_current) {
972
973

        /* First, finish the force loop */
974
        hydro_end_force(p);
Matthieu Schaller's avatar
Matthieu Schaller committed
975
        if (p->gpart != NULL) gravity_end_force(p->gpart, const_G);
976

Matthieu Schaller's avatar
Matthieu Schaller committed
977
        /* Compute the next timestep (hydro condition) */
978
        const int new_dti = get_part_timestep(p, xp, e);
979

Matthieu Schaller's avatar
Matthieu Schaller committed
980
        /* Now we have a time step, proceed with the kick */
981
        kick_part(p, xp, new_dti, timeBase);
982

Matthieu Schaller's avatar
Matthieu Schaller committed
983
984
        /* Number of updated particles */
        updated++;
985
        if (p->gpart != NULL) g_updated++;
986
987
988
      }

      /* Minimal time for next end of time-step */
989
990
      ti_end_min = min(p->ti_end, ti_end_min);
      ti_end_max = max(p->ti_end, ti_end_max);
991
    }
992
993
  }

994
  /* Otherwise, aggregate data from children. */
995
996
997
  else {

    /* Loop over the progeny. */
998
    for (int k = 0; k < 8; k++)
999
      if (c->progeny[k] != NULL) {
1000
        struct cell *restrict cp = c->progeny[k];