Skip to content
Snippets Groups Projects
Commit 12e4a201 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'master' into kill_drift

parents de493833 54aa9fea
No related branches found
No related tags found
1 merge request!225Only drift the particles that need drifting
...@@ -117,8 +117,8 @@ struct cell { ...@@ -117,8 +117,8 @@ struct cell {
struct gpart *gparts; struct gpart *gparts;
/* Pointers for the sorted indices. */ /* Pointers for the sorted indices. */
struct entry *sort, *gsort; struct entry *sort;
unsigned int sorted, gsorted; unsigned int sorted;
/* Pointers to the next level of cells. */ /* Pointers to the next level of cells. */
struct cell *progeny[8]; struct cell *progeny[8];
...@@ -130,8 +130,8 @@ struct cell { ...@@ -130,8 +130,8 @@ struct cell {
struct cell *super; struct cell *super;
/* The task computing this cell's sorts. */ /* The task computing this cell's sorts. */
struct task *sorts, *gsorts; struct task *sorts;
int sortsize, gsortsize; int sortsize;
/* The tasks computing this cell's density. */ /* The tasks computing this cell's density. */
struct link *density, *gradient, *force, *grav; struct link *density, *gradient, *force, *grav;
......
...@@ -27,6 +27,14 @@ ...@@ -27,6 +27,14 @@
#include "stdio.h" #include "stdio.h"
#include "stdlib.h" #include "stdlib.h"
/* Check that we use an ideal equation of state, since other equations of state
are not compatible with these Riemann solvers. */
#ifndef EOS_IDEAL_GAS
#error Currently there are no Riemann solvers that can handle the requested \
equation of state. Select an ideal gas equation of state if you want to \
use this hydro scheme!
#endif
#if defined(RIEMANN_SOLVER_EXACT) #if defined(RIEMANN_SOLVER_EXACT)
#define RIEMANN_SOLVER_IMPLEMENTATION "Exact Riemann solver (Toro 2009)" #define RIEMANN_SOLVER_IMPLEMENTATION "Exact Riemann solver (Toro 2009)"
......
...@@ -29,26 +29,27 @@ extern const char runner_flip[27]; ...@@ -29,26 +29,27 @@ extern const char runner_flip[27];
struct cell; struct cell;
struct engine; struct engine;
/* A struct representing a runner's thread and its data. */ /**
* @brief A struct representing a runner's thread and its data.
*/
struct runner { struct runner {
/* The id of this thread. */ /*! The id of this thread. */
int id; int id;
/* The thread which it is running. */ /*! The actual thread which it is running. */
pthread_t thread; pthread_t thread;
/* The queue to use to get tasks. */ /*! The queue to use to get tasks. */
int cpuid, qid; int cpuid, qid;
/* The underlying runner. */ /*! The engine owing this runner. */
struct engine *e; struct engine *e;
}; };
/* Function prototypes. */ /* Function prototypes. */
void runner_do_ghost(struct runner *r, struct cell *c); void runner_do_ghost(struct runner *r, struct cell *c);
void runner_do_sort(struct runner *r, struct cell *c, int flag, int clock); void runner_do_sort(struct runner *r, struct cell *c, int flag, int clock);
void runner_do_gsort(struct runner *r, struct cell *c, int flag, int clock);
void runner_do_kick(struct runner *r, struct cell *c, int timer); void runner_do_kick(struct runner *r, struct cell *c, int timer);
void runner_do_kick_fixdt(struct runner *r, struct cell *c, int timer); void runner_do_kick_fixdt(struct runner *r, struct cell *c, int timer);
void runner_do_init(struct runner *r, struct cell *c, int timer); void runner_do_init(struct runner *r, struct cell *c, int timer);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment