Commit 88a1f7af authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Added dependencies of the stars feedback pair tasks.

parent 301d41f8
...@@ -485,9 +485,9 @@ struct cell { ...@@ -485,9 +485,9 @@ struct cell {
struct task *sorts_local; struct task *sorts_local;
struct task *sorts_foreign; struct task *sorts_foreign;
/*! The drift task for sparts */ /*! The drift task for sparts */
struct task *drift; struct task *drift;
/*! Max smoothing length in this cell. */ /*! Max smoothing length in this cell. */
double h_max; double h_max;
......
This diff is collapsed.
...@@ -3118,7 +3118,7 @@ void *runner_main(void *data) { ...@@ -3118,7 +3118,7 @@ void *runner_main(void *data) {
/* Reset the sort flags as our work here is done. */ /* Reset the sort flags as our work here is done. */
t->flags = 0; t->flags = 0;
break; break;
case task_type_stars_sort: case task_type_stars_sort:
/* Cleanup only if any of the indices went stale. */ /* Cleanup only if any of the indices went stale. */
runner_do_stars_sort( runner_do_stars_sort(
r, ci, t->flags, r, ci, t->flags,
......
...@@ -3859,7 +3859,7 @@ void space_init(struct space *s, struct swift_params *params, ...@@ -3859,7 +3859,7 @@ void space_init(struct space *s, struct swift_params *params,
/* Read in imposed star smoothing length */ /* Read in imposed star smoothing length */
s->initial_spart_h = parser_get_opt_param_float( s->initial_spart_h = parser_get_opt_param_float(
params, "InitialConditions:stars_smoothing_length", -1.f); params, "InitialConditions:stars_smoothing_length", -1.f);
if (s->initial_spart_h != -1.f) { if (s->initial_spart_h != -1.f) {
message("Imposing a star smoothing length of %e", s->initial_spart_h); message("Imposing a star smoothing length of %e", s->initial_spart_h);
} }
......
...@@ -61,7 +61,7 @@ const char *taskID_names[task_type_count] = {"none", ...@@ -61,7 +61,7 @@ const char *taskID_names[task_type_count] = {"none",
"ghost_out", "ghost_out",
"extra_ghost", "extra_ghost",
"drift_part", "drift_part",
"drift_spart", "drift_spart",
"drift_gpart", "drift_gpart",
"drift_gpart_out", "drift_gpart_out",
"end_force", "end_force",
...@@ -268,7 +268,7 @@ float task_overlap(const struct task *restrict ta, ...@@ -268,7 +268,7 @@ float task_overlap(const struct task *restrict ta,
// MATTHIEU: This should not be necessary // MATTHIEU: This should not be necessary
if (size_union == 0) return 0.f; if (size_union == 0) return 0.f;
/* Compute the intersection of the cell data. */ /* Compute the intersection of the cell data. */
const size_t size_intersect = task_cell_overlap_part(ta->ci, tb->ci) + const size_t size_intersect = task_cell_overlap_part(ta->ci, tb->ci) +
task_cell_overlap_part(ta->ci, tb->cj) + task_cell_overlap_part(ta->ci, tb->cj) +
......
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