Skip to content

GitLab

Commit 5bca8d12 authored by Peter Eastman's avatar Peter Eastman
Browse files

Fixed bug when a system involved multiple nonbonded forces (bug 1080)

parent 06a20544
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
platforms/opencl/src/OpenCLNonbondedUtilities.cpp
View file @ 5bca8d12
...@@ -90,14 +90,12 @@ void OpenCLNonbondedUtilities::addInteraction(bool usesCutoff, bool usesPeriodic ...@@ -90,14 +90,12 @@ void OpenCLNonbondedUtilities::addInteraction(bool usesCutoff, bool usesPeriodic
if (!sameExclusions) if (!sameExclusions)
throw OpenMMException("All Forces must have identical exceptions"); throw OpenMMException("All Forces must have identical exceptions");
} }
else { useCutoff = usesCutoff;
useCutoff = usesCutoff; usePeriodic = usesPeriodic;
usePeriodic = usesPeriodic; cutoff = cutoffDistance;
cutoff = cutoffDistance; kernelSource += kernel+"\n";
kernelSource += kernel+"\n"; if (usesExclusions)
if (usesExclusions) atomExclusions = exclusionList;
atomExclusions = exclusionList;
}
} }
void OpenCLNonbondedUtilities::addParameter(const ParameterInfo& parameter) { void OpenCLNonbondedUtilities::addParameter(const ParameterInfo& parameter) {
......
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