Commit b48cf575 by Pedro Gonnet

Merge remote-tracking branch 'origin' into tasks_cleanup

```Conflicts:
src/engine.c
src/scheduler.c
src/space.c
parents 98f8fde9 35b13d49
 ... ... @@ -19,11 +19,6 @@ #ifndef SWIFT_RUNNER_DOIACT_GRAV_H #define SWIFT_RUNNER_DOIACT_GRAV_H /* Includes. */ #include "cell.h" #include "clocks.h" #include "part.h" /** * @brief Compute the sorted gravity interactions between a cell pair. * ... ... @@ -60,8 +55,8 @@ void runner_dopair_grav_new(struct runner *r, struct cell *ci, sid = space_getsid(e->s, &ci, &cj, shift); /* Make sure the cells are sorted. */ runner_do_gsort(r, ci, (1 << sid), 0); runner_do_gsort(r, cj, (1 << sid), 0); // runner_do_gsort(r, ci, (1 << sid), 0); // runner_do_gsort(r, cj, (1 << sid), 0); /* Have the cells been sorted? */ if (!(ci->gsorted & (1 << sid)) || !(cj->gsorted & (1 << sid))) ... ... @@ -69,7 +64,7 @@ void runner_dopair_grav_new(struct runner *r, struct cell *ci, /* Get the cutoff shift. */ for (rshift = 0.0, k = 0; k < 3; k++) rshift += shift[k] * runner_shift[3 * sid + k]; rshift += shift[k] * runner_shift[sid][k]; /* Pick-out the sorted lists. */ sort_i = &ci->gsort[sid * (ci->count + 1)]; ... ...
 ... ... @@ -35,7 +35,6 @@ #include "cell.h" #include "lock.h" #include "queue.h" #include "space.h" #include "task.h" #include "threadpool.h" ... ...
 ... ... @@ -26,22 +26,22 @@ /* Some standard headers. */ #include #include #include #include #include #include #include /* MPI headers. */ #ifdef WITH_MPI #include #endif /* This object's header. */ #include "serial_io.h" /* Local includes. */ #include "common_io.h" #include "engine.h" #include "error.h" #include "kernel_hydro.h" #include "part.h" #include "units.h" /*----------------------------------------------------------------------------- * Routines reading an IC file ... ...
 ... ... @@ -19,6 +19,9 @@ #ifndef SWIFT_SERIAL_IO_H #define SWIFT_SERIAL_IO_H /* Config parameters. */ #include "../config.h" /* MPI headers. */ #ifdef WITH_MPI #include ... ...
 ... ... @@ -36,8 +36,11 @@ /* Local includes. */ #include "common_io.h" #include "const.h" #include "engine.h" #include "error.h" #include "kernel_hydro.h" #include "part.h" #include "units.h" /*----------------------------------------------------------------------------- * Routines reading an IC file ... ...
 ... ... @@ -19,6 +19,9 @@ #ifndef SWIFT_SINGLE_IO_H #define SWIFT_SINGLE_IO_H /* Config parameters. */ #include "../config.h" /* Includes. */ #include "engine.h" #include "part.h" ... ...
This diff is collapsed.
This diff is collapsed.