Skip to content

GitLab

"serialization/tests/TestSerializeCustomCVForce.cpp" did not exist on "5d9b6481e9a8736859f6d9892e55d554db210079"
Commit d33b232e authored by peastman's avatar peastman
Browse files

Fixed segfault in AmoebaMultipoleForce

parent b32e5832
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
platforms/cuda/src/CudaNonbondedUtilities.cpp
View file @ d33b232e
......@@ -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;
......
platforms/opencl/src/OpenCLNonbondedUtilities.cpp
View file @ d33b232e
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment