Commit ce6b6c58 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Make the ID of the Gizmo-particles a long long and not unsigned long long

parent 68cbf747
......@@ -63,23 +63,22 @@
/* SPH variant to use */
//#define MINIMAL_SPH
//#define GADGET2_SPH
#define GADGET2_SPH
//#define DEFAULT_SPH
#define GIZMO_SPH
//#define GIZMO_SPH
/* Riemann solver to use (GIZMO_SPH only) */
#define RIEMANN_SOLVER_EXACT
//#define RIEMANN_SOLVER_TRRS
//#define RIEMANN_SOLVER_HLLC
/* Type of gradients to use (GIZMO_SPH only)
If no option is chosen, no gradients are used (first order scheme) */
/* Type of gradients to use (GIZMO_SPH only) */
/* If no option is chosen, no gradients are used (first order scheme) */
//#define GRADIENTS_SPH
#define GRADIENTS_GIZMO
/* Types of slope limiter to use (GIZMO_SPH only)
Different slope limiters can be combined, so multiple options may
be selected */
/* Types of slope limiter to use (GIZMO_SPH only) */
/* Different slope limiters can be combined */
#define SLOPE_LIMITER_PER_FACE
#define SLOPE_LIMITER_CELL_WIDE
......
......@@ -196,7 +196,7 @@ struct part {
float mass;
/* Particle ID. */
unsigned long long id;
long long id;
/* Associated gravitas. */
struct gpart *gpart;
......
......@@ -82,8 +82,8 @@ const char runner_flip[27] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
#define FUNCTION density
#include "runner_doiact.h"
/* Import the gradient loop functions (if required). */
#ifdef EXTRA_HYDRO_LOOP
/* Import the gradient loop functions. */
#undef FUNCTION
#define FUNCTION gradient
#include "runner_doiact.h"
......@@ -436,7 +436,9 @@ void runner_do_init(struct runner *r, struct cell *c, int timer) {
* @param c The cell.
*/
void runner_do_extra_ghost(struct runner *r, struct cell *c) {
#ifdef EXTRA_HYDRO_LOOP
struct part *restrict parts = c->parts;
const int count = c->count;
const int ti_current = r->e->ti_current;
......@@ -461,6 +463,9 @@ void runner_do_extra_ghost(struct runner *r, struct cell *c) {
}
}
}
#else
error("SWIFT was not compiled with the extra hydro loop activated.");
#endif
}
......@@ -1131,7 +1136,8 @@ void *runner_main(void *data) {
/* Different types of tasks... */
switch (t->type) {
case task_type_self:
if (t->subtype == task_subtype_density) runner_doself1_density(r, ci);
if (t->subtype == task_subtype_density)
runner_doself1_density(r, ci);
#ifdef EXTRA_HYDRO_LOOP
else if (t->subtype == task_subtype_gradient)
runner_doself1_gradient(r, ci);
......@@ -1194,9 +1200,11 @@ void *runner_main(void *data) {
case task_type_ghost:
runner_do_ghost(r, ci);
break;
#ifdef EXTRA_HYDRO_LOOP
case task_type_extra_ghost:
runner_do_extra_ghost(r, ci);
break;
#endif
case task_type_kick:
runner_do_kick(r, ci, 1);
break;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment