diff --git a/examples/main.c b/examples/main.c index 103f76048dfaee37f412c215267b70867417bb81..eccc83a3fe54f49b53a58ad97578c08baad7bc8c 100644 --- a/examples/main.c +++ b/examples/main.c @@ -322,7 +322,7 @@ int main(int argc, char *argv[]) { MPI_Bcast(params, sizeof(struct swift_params), MPI_BYTE, 0, MPI_COMM_WORLD); #endif -/* Prepare the domain decomposition scheme */ + /* Prepare the domain decomposition scheme */ struct repartition repartition; #ifdef WITH_MPI struct partition initial_partition; @@ -489,9 +489,8 @@ int main(int argc, char *argv[]) { if (myrank == 0) clocks_gettime(&tic); struct engine e; engine_init(&e, &s, params, nr_nodes, myrank, nr_threads, N_total[0], - N_total[1], with_aff, engine_policies, talking, &us, - &prog_const, &hydro_properties, &potential, &cooling_func, - &sourceterms); + N_total[1], with_aff, engine_policies, talking, &us, &prog_const, + &hydro_properties, &potential, &cooling_func, &sourceterms); if (myrank == 0) { clocks_gettime(&toc); message("engine_init took %.3f %s.", clocks_diff(&tic, &toc), diff --git a/src/clocks.c b/src/clocks.c index 22e28ee012cfdd0403cdbaabc101e68a17366cac..d5f0e571fe0a4694c4088bb05014fafa99d60488 100644 --- a/src/clocks.c +++ b/src/clocks.c @@ -259,7 +259,7 @@ const char *clocks_get_timesincestart() { */ double clocks_get_cputime_used() { - struct tms tmstic; - times(&tmstic); - return (double)(tmstic.tms_utime + tmstic.tms_cutime); + struct tms tmstic; + times(&tmstic); + return (double)(tmstic.tms_utime + tmstic.tms_cutime); } diff --git a/src/clocks.h b/src/clocks.h index 51b53f541495092ecc0fbb228c6ae56b4407f46e..4c69e130d9bfc5e61fb03fc9820ffc76d2440dc4 100644 --- a/src/clocks.h +++ b/src/clocks.h @@ -19,8 +19,8 @@ #ifndef SWIFT_CLOCKS_H #define SWIFT_CLOCKS_H -#include <time.h> #include <sys/times.h> +#include <time.h> #include "cycle.h" /* Struct to record a time for the clocks functions. */ @@ -44,5 +44,4 @@ const char *clocks_get_timesincestart(); double clocks_get_cputime_used(); - #endif /* SWIFT_CLOCKS_H */ diff --git a/src/engine.c b/src/engine.c index 46ebb4110e8543282cad0a10c84f8ff98c572b05..b729bc01f9316545f20ca83eca8f0d9fade3ec15 100644 --- a/src/engine.c +++ b/src/engine.c @@ -3277,7 +3277,7 @@ void engine_init(struct engine *e, struct space *s, fprintf(e->file_timesteps, "# %6s %14s %14s %10s %10s %16s [%s]\n", "Step", "Time", "Time-step", "Updates", "g-Updates", "Wall-clock time", - clocks_getunit()); + clocks_getunit()); fflush(e->file_timesteps); } diff --git a/src/partition.c b/src/partition.c index 012ef9c0763dcb395d8e1c96e1c5ea41b69543e8..d1852776677a9a5af62dbf2c16000db6e3b1abc9 100644 --- a/src/partition.c +++ b/src/partition.c @@ -722,8 +722,7 @@ void partition_repartition(enum repartition_type reparttype, int nodeID, #if defined(WITH_MPI) && defined(HAVE_METIS) - if (reparttype == REPART_METIS_BOTH || - reparttype == REPART_METIS_EDGE || + if (reparttype == REPART_METIS_BOTH || reparttype == REPART_METIS_EDGE || reparttype == REPART_METIS_VERTEX_EDGE) { int partweights; @@ -1006,9 +1005,10 @@ void partition_init(struct partition *partition, /* Get the fraction time difference between nodes. If larger than * this when a repartition is being considered it will be allowed. */ repartition->fractionaltime = parser_get_opt_param_float( - params, "DomainDecomposition:fractionaltime", 0.1); + params, "DomainDecomposition:fractionaltime", 0.1); if (repartition->fractionaltime < 0 || repartition->fractionaltime > 1) - error("Invalid DomainDecomposition:fractionaltime, must be in range 0 to 1"); + error( + "Invalid DomainDecomposition:fractionaltime, must be in range 0 to 1"); #else error("SWIFT was not compiled with MPI support");