Merge release-4-6 into master

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

diff --git a/src/gromacs/mdlib/sim_util.c b/src/gromacs/mdlib/sim_util.c
index 7e1a7fc21b56e513fe66ec5f1796ac775e4d3088..c66086631a5851a488e3afc852996f0c1cf03f9e 100644 (file)
--- a/src/gromacs/mdlib/sim_util.c
+++ b/src/gromacs/mdlib/sim_util.c
@@ -1221,7 +1221,7 @@ void do_force_cutsVERLET(FILE *fplog,t_commrec *cr,
     
     if (ed)
     {
-        do_flood(fplog,cr,x,f,ed,box,step,bNS);
+        do_flood(cr,inputrec,x,f,ed,box,step,bNS);
     }
 
     if (bUseOrEmulGPU && !bDiffKernels)
@@ -1306,7 +1306,10 @@ void do_force_cutsVERLET(FILE *fplog,t_commrec *cr,
             wallcycle_stop(wcycle,ewcWAIT_GPU_NB_L);
 
             /* now clear the GPU outputs while we finish the step on the CPU */
+
+            wallcycle_start_nocount(wcycle,ewcLAUNCH_GPU_NB);
             nbnxn_cuda_clear_outputs(nbv->cu_nbv, flags);
+            wallcycle_stop(wcycle,ewcLAUNCH_GPU_NB);
         }
         else
         {            
@@ -1773,7 +1776,7 @@ void do_force_cutsGROUP(FILE *fplog,t_commrec *cr,
 
     if (ed)
     {
-        do_flood(fplog,cr,x,f,ed,box,step,bNS);
+        do_flood(cr,inputrec,x,f,ed,box,step,bNS);
     }
 
     if (DOMAINDECOMP(cr))