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

Post-merge fixes

parent 5b612b6d
......@@ -245,7 +245,7 @@ int cell_pack(struct cell *c, struct pcell *pc) {
*
* @return The number of packed cells.
*/
int cell_pack_ti_ends(struct cell *c, int *ti_ends) {
int cell_pack_ti_ends(struct cell *c, integertime_t *ti_ends) {
#ifdef WITH_MPI
......
......@@ -2444,6 +2444,7 @@ void engine_collect_timestep(struct engine *e) {
c->g_updated = 0;
c->s_updated = 0;
}
}
/* Aggregate the data from the different nodes. */
#ifdef WITH_MPI
......@@ -2971,7 +2972,7 @@ void engine_split(struct engine *e, struct partition *initial_partition) {
/* Re-link the parts. */
if (s->nr_parts > 0 && s->nr_gparts > 0)
part_relink_parts(s->gparts, s->nr_gparts, s->parts);
part_relink_parts_to_gparts(s->gparts, s->nr_gparts, s->parts);
#ifdef SWIFT_DEBUG_CHECKS
......@@ -3040,7 +3041,7 @@ static cpu_set_t *engine_entry_affinity() {
/**
* @brief Ensure the NUMA node on which we initialise (first touch) everything
* doesn't change before engine_init allocates NUMA-local workers.
* doesn't change before engine_init allocates NUMA-local workers.
*/
void engine_pin() {
......
......@@ -1080,7 +1080,7 @@ void scheduler_start(struct scheduler *s) {
/* Don't check MPI stuff */
if (t->type == task_type_send || t->type == task_type_recv) continue;
if (ci == NULL && cj == NULL) {
if (ci == NULL && cj == NULL) {
if (t->type != task_type_grav_gather_m && t->type != task_type_grav_fft)
error("Task not associated with cells!");
......
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