Merge origin/release-4-6 into master

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

diff --git a/src/gromacs/mdlib/domdec.c b/src/gromacs/mdlib/domdec.c
index cf8f5b8e989957c48f84221825c7b25c8936f398..438d8dfb2062ca0fea526fc0f2ddb786a07f3bfc 100644 (file)
--- a/src/gromacs/mdlib/domdec.c
+++ b/src/gromacs/mdlib/domdec.c
@@ -253,7 +253,7 @@ typedef struct gmx_domdec_comm
 
     /* Cell sizes for static load balancing, first index cartesian */
     real **slb_frac;
-    
+
     /* The width of the communicated boundaries */
     real cutoff_mbody;
     real cutoff;
@@ -5010,7 +5010,7 @@ static double force_flop_count(t_nrnb *nrnb)
     const char *name;
 
     sum = 0;
-    for(i=eNR_NBKERNEL010; i<eNR_NBKERNEL_FREE_ENERGY; i++)
+    for(i=0; i<eNR_NBKERNEL_FREE_ENERGY; i++)
     {
         /* To get closer to the real timings, we half the count
          * for the normal loops and again half it for water loops.