Skip to content

GitLab

Unverified Commit a351c396 authored by peastman's avatar peastman Committed by GitHub
Browse files

Merge pull request #2328 from peastman/offset 

Fixed error applying parameter offsets with CPU platform
parents d5905f89 35b7189c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
platforms/cpu/src/CpuKernels.cpp
View file @ a351c396
...@@ -722,8 +722,6 @@ void CpuCalcNonbondedForceKernel::copyParametersToContext(ContextImpl& context, ...@@ -722,8 +722,6 @@ void CpuCalcNonbondedForceKernel::copyParametersToContext(ContextImpl& context,
// Record the values. // Record the values.
chargePosqIndex = data.requestPosqIndex();
ljPosqIndex = data.requestPosqIndex();
for (int i = 0; i < numParticles; ++i) for (int i = 0; i < numParticles; ++i)
force.getParticleParameters(i, baseParticleParams[i][0], baseParticleParams[i][1], baseParticleParams[i][2]); force.getParticleParameters(i, baseParticleParams[i][0], baseParticleParams[i][1], baseParticleParams[i][2]);
for (int i = 0; i < num14; ++i) { for (int i = 0; i < num14; ++i) {
...@@ -806,6 +804,8 @@ void CpuCalcNonbondedForceKernel::computeParameters(ContextImpl& context, bool o ...@@ -806,6 +804,8 @@ void CpuCalcNonbondedForceKernel::computeParameters(ContextImpl& context, bool o
} }
else else
ewaldSelfEnergy = 0.0; ewaldSelfEnergy = 0.0;
chargePosqIndex = data.requestPosqIndex();
ljPosqIndex = data.requestPosqIndex();
} }
// Compute exception parameters. // Compute exception parameters.
......
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