Merge branch 'release-4-5-patches' into rotation-4-5

[alexxy/gromacs.git] / src / mdlib / gmx_wallcycle.c

diff --git a/src/mdlib/gmx_wallcycle.c b/src/mdlib/gmx_wallcycle.c
index 851153811bbd80b533e87ca86612c179eab3af43..47fbcdc4802993e1a1c880f016622e62c0c0aac5 100644 (file)
--- a/src/mdlib/gmx_wallcycle.c
+++ b/src/mdlib/gmx_wallcycle.c
@@ -330,18 +330,23 @@ void wallcycle_sum(t_commrec *cr, gmx_wallcycle_t wc,double cycles[])
 }
 
 static void print_cycles(FILE *fplog, double c2t, const char *name, int nnodes,
-                        int n, gmx_cycles_t c, gmx_cycles_t tot)
+                         int n, double c, double tot)
 {
-  char num[11];
+    char num[11];
   
-  if (c > 0) {
-    if (n > 0)
-      sprintf(num,"%10d",n);
-    else
-      sprintf(num,"          ");
-    fprintf(fplog," %-19s %4d %10s %12.3f %10.1f   %5.1f\n",
-           name,nnodes,num,c*1e-9,c*c2t,100*(double)c/(double)tot);
-  }
+    if (c > 0)
+    {
+        if (n > 0)
+        {
+            sprintf(num,"%10d",n);
+        }
+        else
+        {
+            sprintf(num,"          ");
+        }
+        fprintf(fplog," %-19s %4d %10s %12.3f %10.1f   %5.1f\n",
+                name,nnodes,num,c*1e-9,c*c2t,100*c/tot);
+    }
 }
 
 static gmx_bool subdivision(int ewc)
@@ -350,7 +355,7 @@ static gmx_bool subdivision(int ewc)
 }
 
 void wallcycle_print(FILE *fplog, int nnodes, int npme, double realtime,
-                    gmx_wallcycle_t wc, double cycles[])
+                     gmx_wallcycle_t wc, double cycles[])
 {
     double c2t,tot,sum;
     int    i,j,npp;