diff --git a/src/engine.c b/src/engine.c index 869432417d848e68290a44ba4e63cc9b3dc75b9c..696df5f011bc52e198188eda675731edc866e39d 100644 --- a/src/engine.c +++ b/src/engine.c @@ -4530,7 +4530,7 @@ void engine_init(struct engine *e, struct space *s, if (with_aff) engine_unpin(); #endif - if (with_aff) { + if (with_aff && nodeID == 0) { #ifdef HAVE_SETAFFINITY #ifdef WITH_MPI printf("[%04i] %s engine_init: cpu map is [ ", nodeID, diff --git a/src/space.c b/src/space.c index 5e3c1a51711104530c27337abd82349802c5623a..b9fe639b195226da3d3168581ebd26f3273d28eb 100644 --- a/src/space.c +++ b/src/space.c @@ -2928,14 +2928,15 @@ void space_init(struct space *s, const struct swift_params *params, hydro_space_init(&s->hs, s); ticks tic = getticks(); - message("first init..."); + if (verbose) message("first init..."); /* Set the particles in a state where they are ready for a run */ space_first_init_parts(s); space_first_init_xparts(s); space_first_init_gparts(s); space_first_init_sparts(s); - message("took %.3f %s.", clocks_from_ticks(getticks() - tic), - clocks_getunit()); + if (verbose) + message("took %.3f %s.", clocks_from_ticks(getticks() - tic), + clocks_getunit()); /* Init the space lock. */ if (lock_init(&s->lock) != 0) error("Failed to create space spin-lock."); @@ -2957,7 +2958,8 @@ void space_replicate(struct space *s, int replicate, int verbose) { if (replicate < 1) error("Invalid replicate value: %d", replicate); - message("Replicating space %d times along each axis.", replicate); + if (verbose) + message("Replicating space %d times along each axis.", replicate); const int factor = replicate * replicate * replicate;