Fix segfault with timer reset and -nb cpu
authorErik Lindahl <erik@kth.se>
Fri, 12 Jun 2015 19:49:27 +0000 (21:49 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 16 Jun 2015 10:33:10 +0000 (12:33 +0200)
Fixes #1710.

Change-Id: I701b8bb6111fd43379997b7af0aedae7a5fe567a

src/programs/mdrun/md.cpp

index f6c3465c8df255fe3618928fa972eed7a0fbd994..4c34f399c159880c1400d98148b085f3c8f5923e 100644 (file)
@@ -133,7 +133,10 @@ static void reset_all_counters(FILE *fplog, t_commrec *cr,
     md_print_warn(cr, fplog, "step %s: resetting all time and cycle counters\n",
                   gmx_step_str(step, sbuf));
 
-    nbnxn_gpu_reset_timings(nbv);
+    if (use_GPU(nbv))
+    {
+        nbnxn_gpu_reset_timings(nbv);
+    }
 
     wallcycle_stop(wcycle, ewcRUN);
     wallcycle_reset_all(wcycle);