Merge pull request #608 from peastman/master

Fixed bug in CustomManyParticleForce that caused crash

platforms/cuda/src/CudaKernels.cpp

@@ -5024,6 +5024,10 @@ double CudaCalcCustomManyParticleForceKernel::execute(ContextImpl& context, bool
                 maxNeighborPairs = (int) (1.1*(*numPairs));
                 neighborPairs = CudaArray::create<int2>(cu, maxNeighborPairs, "customManyParticleNeighborPairs");
                 neighbors = CudaArray::create<int>(cu, maxNeighborPairs, "customManyParticleNeighbors");
+                forceArgs[5] = &neighbors->getDevicePointer();
+                neighborsArgs[5] = &neighborPairs->getDevicePointer();
+                copyPairsArgs[0] = &neighborPairs->getDevicePointer();
+                copyPairsArgs[1] = &neighbors->getDevicePointer();
                 continue;
             }
         }

platforms/opencl/src/OpenCLKernels.cpp

@@ -5190,6 +5190,10 @@ double OpenCLCalcCustomManyParticleForceKernel::execute(ContextImpl& context, bo
                 maxNeighborPairs = (int) (1.1*(*numPairs));
                 neighborPairs = OpenCLArray::create<mm_int2>(cl, maxNeighborPairs, "customManyParticleNeighborPairs");
                 neighbors = OpenCLArray::create<int>(cl, maxNeighborPairs, "customManyParticleNeighbors");
+                forceKernel.setArg<cl::Buffer>(5, neighbors->getDeviceBuffer());
+                neighborsKernel.setArg<cl::Buffer>(5, neighborPairs->getDeviceBuffer());
+                copyPairsKernel.setArg<cl::Buffer>(0, neighborPairs->getDeviceBuffer());
+                copyPairsKernel.setArg<cl::Buffer>(1, neighbors->getDeviceBuffer());
                 continue;
             }
         }