From 595c6399aadf58f74283f40bd068cb550b178d14 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Thu, 22 Sep 2016 18:20:21 +0100
Subject: [PATCH] Code formatting
---
examples/main.c | 2 +-
src/engine.c | 20 ++++++++++++--------
src/version.c | 3 +--
src/version.h | 2 +-
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/examples/main.c b/examples/main.c
index 2833ec3169..cd7e4b6b89 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -265,7 +265,7 @@ int main(int argc, char *argv[]) {
/* Report CPU frequency. */
cpufreq = clocks_get_cpufreq();
if (myrank == 0) {
- message("Running on: %s",hostname());
+ message("Running on: %s", hostname());
message("CPU frequency used for tick conversion: %llu Hz", cpufreq);
}
diff --git a/src/engine.c b/src/engine.c
index 0319dfd81f..cee11667f1 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -2174,15 +2174,18 @@ void engine_print_task_counts(struct engine *e) {
int counts[task_type_count + 1];
for (int k = 0; k <= task_type_count; k++) counts[k] = 0;
for (int k = 0; k < sched->nr_tasks; k++) {
- if (sched->tasks[k].skip) counts[task_type_count] += 1;
- else counts[(int)sched->tasks[k].type] += 1;
+ if (sched->tasks[k].skip)
+ counts[task_type_count] += 1;
+ else
+ counts[(int)sched->tasks[k].type] += 1;
}
#ifdef WITH_MPI
printf("[%04i] %s engine_print_task_counts: task counts are [ %s=%i",
e->nodeID, clocks_get_timesincestart(), taskID_names[0], counts[0]);
#else
printf("%s engine_print_task_counts: time step:%d task counts are [ %s=%i",
- clocks_get_timesincestart(), e->ti_current, taskID_names[0], counts[0]);
+ clocks_get_timesincestart(), e->ti_current, taskID_names[0],
+ counts[0]);
#endif
for (int k = 1; k < task_type_count; k++)
printf(" %s=%i", taskID_names[k], counts[k]);
@@ -2796,7 +2799,7 @@ void engine_step(struct engine *e) {
mask |= 1 << task_type_recv;
submask |= 1 << task_subtype_tend;
}
-
+
engine_print_task_counts(e);
if (e->verbose) engine_print_task_counts(e);
@@ -3364,13 +3367,14 @@ void engine_init(struct engine *e, struct space *s,
nr_nodes * nr_threads);
e->file_timesteps = fopen(timestepsfileName, "w");
fprintf(e->file_timesteps,
- "# Host: %s\n# Branch: %s\n# Revision: %s\n# Compiler: %s, Version: %s \n# "
+ "# Host: %s\n# Branch: %s\n# Revision: %s\n# Compiler: %s, "
+ "Version: %s \n# "
"Number of threads: %d\n# Number of MPI ranks: %d\n# Hydrodynamic "
"scheme: %s\n# Hydrodynamic kernel: %s\n# No. of neighbours: %.2f "
"+/- %.2f\n# Eta: %f\n",
- hostname(), git_branch(), git_revision(), compiler_name(), compiler_version(),
- e->nr_threads, e->nr_nodes, SPH_IMPLEMENTATION, kernel_name,
- e->hydro_properties->target_neighbours,
+ hostname(), git_branch(), git_revision(), compiler_name(),
+ compiler_version(), e->nr_threads, e->nr_nodes, SPH_IMPLEMENTATION,
+ kernel_name, e->hydro_properties->target_neighbours,
e->hydro_properties->delta_neighbours,
e->hydro_properties->eta_neighbours);
diff --git a/src/version.c b/src/version.c
index 4a5cdebffa..3d948e593f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -62,8 +62,7 @@ const char *hostname(void) {
static int initialised = 0;
if (!initialised) {
buf[255] = '\0';
- if(gethostname(buf,255))
- sprintf(buf, "%s", "Unknown host");
+ if (gethostname(buf, 255)) sprintf(buf, "%s", "Unknown host");
initialised = 1;
}
return buf;
diff --git a/src/version.h b/src/version.h
index 6be044bf5f..07a98c5e31 100644
--- a/src/version.h
+++ b/src/version.h
@@ -22,7 +22,7 @@
const char* package_description(void);
const char* package_version(void);
-const char *hostname(void);
+const char* hostname(void);
const char* git_revision(void);
const char* git_branch(void);
const char* compiler_name(void);
--
GitLab