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

Code formatting

parent 60b3424b
No related branches found
No related tags found
5 merge requests!1997Yet another master into zoom buffer branch merge (with formatting all done!),!1994Draft: Testing master -> zoom merge,!1987Update zoom_merge with master updates (after wrangling immense conflicts),!1982Update zoom merge branch with latest master developments,!1956Rename space_getsid to space_getsid_and_swap_cells() to try to prevent...
...@@ -400,9 +400,9 @@ void io_write_output_field_parameter(const char* filename, int with_cosmology, ...@@ -400,9 +400,9 @@ void io_write_output_field_parameter(const char* filename, int with_cosmology,
strcpy(&comment_write_buffer[PARSER_MAX_LINE_SIZE / 2 - 4], "..."); strcpy(&comment_write_buffer[PARSER_MAX_LINE_SIZE / 2 - 4], "...");
} }
fprintf(file, " %s_%s: %s # (%dD - %zd bytes / dim) %s : %s\n", list[i].name, fprintf(file, " %s_%s: %s # (%dD - %zd bytes / dim) %s : %s\n",
part_type_names[ptype], "on", list[i].dimension, io_sizeof_type(list[i].type), list[i].name, part_type_names[ptype], "on", list[i].dimension,
comment_write_buffer, unit_buffer); io_sizeof_type(list[i].type), comment_write_buffer, unit_buffer);
} }
fprintf(file, "\n"); fprintf(file, "\n");
......
...@@ -1374,7 +1374,8 @@ static void scheduler_splittask_hydro(struct task *t, struct scheduler *s) { ...@@ -1374,7 +1374,8 @@ static void scheduler_splittask_hydro(struct task *t, struct scheduler *s) {
scheduler_addtask(s, task_type_pair, t->subtype, 0, 0, scheduler_addtask(s, task_type_pair, t->subtype, 0, 0,
ci->progeny[j], cj->progeny[k]); ci->progeny[j], cj->progeny[k]);
scheduler_splittask_hydro(tl, s); scheduler_splittask_hydro(tl, s);
tl->flags = space_getsid_and_swap_cells(s->space, &t->ci, &t->cj, shift); tl->flags = space_getsid_and_swap_cells(s->space, &t->ci,
&t->cj, shift);
} }
} }
} /* pair interaction? */ } /* pair interaction? */
......
...@@ -43,9 +43,9 @@ ...@@ -43,9 +43,9 @@
* *
* @return The shift ID and set shift, may or may not swap ci and cj. * @return The shift ID and set shift, may or may not swap ci and cj.
*/ */
__attribute__((always_inline, nonnull)) INLINE static int space_getsid_and_swap_cells( __attribute__((always_inline, nonnull)) INLINE static int
const struct space *s, struct cell **ci, struct cell **cj, space_getsid_and_swap_cells(const struct space *s, struct cell **ci,
double shift[3]) { struct cell **cj, double shift[3]) {
/* Get the relative distance between the pairs, wrapping. */ /* Get the relative distance between the pairs, wrapping. */
const int periodic = s->periodic; const int periodic = s->periodic;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment