Fix to the previous checkin (which broke load balancing)

c56b4801 · Peter Eastman · 5a9897bd · c56b4801
Commit c56b4801 authored May 04, 2011 by Peter Eastman
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

platforms/opencl/src/OpenCLParallelKernels.cpp platforms/opencl/src/OpenCLParallelKernels.cpp +6 -2

No files found.
--- a/platforms/opencl/src/OpenCLParallelKernels.cpp
+++ b/platforms/opencl/src/OpenCLParallelKernels.cpp
@@ -82,8 +82,12 @@ public:
        // Execute the kernel, then download forces.
        
        energy += kernel.finishComputation(context, includeForce, includeEnergy);
-        if (includeForce && cl.getContextIndex() > 0)
+        if (includeForce) {
+            if (cl.getContextIndex() > 0)
                cl.getForce().download(&contextForces[cl.getContextIndex()*cl.getPaddedNumAtoms()]);
+            else
+                cl.getQueue().finish();
+        }
        completionTime = getTime();
    }
 private: