From 6e2058edcecbfef80b6f4acf0c2a6f6170fbac02 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Fri, 19 Apr 2024 15:18:32 +0200 Subject: [PATCH] Fix heat output order --- src/heat/main_mpi.c | 4 ++-- src/heat/main_smp.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/heat/main_mpi.c b/src/heat/main_mpi.c index af980a1..7ff91ed 100644 --- a/src/heat/main_mpi.c +++ b/src/heat/main_mpi.c @@ -80,12 +80,12 @@ int main(int argc, char **argv) #endif fprintf(stderr, "%14s %14s %14s %8s %8s %8s %8s %8s %8s\n", - "throughput", "time", "error", + "time", "throughput", "error", "rows", "cols", "rbs", "cbs", "threads", "steps"); fprintf(stdout, "%14e %14e %14e %8ld %8ld %8d %8d %8d %8d\n", - throughput, end-start, residual, + end-start, throughput, residual, conf.rows, conf.cols, conf.rbs, conf.cbs, threads, conf.convergenceTimesteps); diff --git a/src/heat/main_smp.c b/src/heat/main_smp.c index 5d29b7d..1b3656d 100644 --- a/src/heat/main_smp.c +++ b/src/heat/main_smp.c @@ -32,10 +32,10 @@ int main(int argc, char **argv) long total_elem = iter_elem * niter; double throughput = total_elem / delta_time; - fprintf(stderr, "%14s %14s %14s %8s %8s %8s %8s %8s\n", - "time", "updates/s", "rel. error", - "rows", "cols", - "rbs", "cbs", "iters"); +// fprintf(stderr, "%14s %14s %14s %8s %8s %8s %8s %8s\n", +// "time", "updates/s", "rel. error", +// "rows", "cols", +// "rbs", "cbs", "iters"); fprintf(stdout, "%14e %14e %14e %8ld %8ld %8d %8d %8ld\n", delta_time, throughput, residual, conf.rows, conf.cols,