Merge pull request #1068 from peastman/segfault

Fixed segfault in AmoebaMultipoleForce

Merge pull request #1068 from peastman/segfault
Fixed segfault in AmoebaMultipoleForce
5cc23632 · peastman · ce19f85c · d33b232e · 5cc23632 · 5cc23632
Commit 5cc23632 authored Aug 03, 2015 by peastman
Showing with 2 additions and 2 deletions

platforms/cuda/src/CudaNonbondedUtilities.cpp platforms/cuda/src/CudaNonbondedUtilities.cpp +1 -1

platforms/opencl/src/OpenCLNonbondedUtilities.cpp platforms/opencl/src/OpenCLNonbondedUtilities.cpp +1 -1

No files found.
--- a/platforms/cuda/src/CudaNonbondedUtilities.cpp
+++ b/platforms/cuda/src/CudaNonbondedUtilities.cpp
@@ -452,7 +452,7 @@ void CudaNonbondedUtilities::createKernelsForGroups(int groups) {
    kernels.cutoffDistance = cutoff;
    if (kernels.hasForces)
        kernels.forceKernel = createInteractionKernel(source, parameters, arguments, true, true, groups);
-    if (useCutoff && kernels.hasForces) {
+    if (useCutoff) {
        double padding = (usePadding ? 0.1*cutoff : 0.0);
        double paddedCutoff = cutoff+padding;
        map<string, string> defines;

--- a/platforms/opencl/src/OpenCLNonbondedUtilities.cpp
+++ b/platforms/opencl/src/OpenCLNonbondedUtilities.cpp
@@ -435,7 +435,7 @@ void OpenCLNonbondedUtilities::createKernelsForGroups(int groups) {
    kernels.cutoffDistance = cutoff;
    if (kernels.hasForces)
        kernels.forceKernel = createInteractionKernel(source, parameters, arguments, true, true, groups);
-    if (useCutoff && kernels.hasForces) {
+    if (useCutoff) {
        double padding = (usePadding ? 0.1*cutoff : 0.0);
        double paddedCutoff = cutoff+padding;
        map<string, string> defines;