Commit 9cd18aeb authored by peastman's avatar peastman
Browse files

Bug fix

parent aa970221
...@@ -4784,7 +4784,7 @@ void CudaCalcCustomManyParticleForceKernel::initialize(const System& system, con ...@@ -4784,7 +4784,7 @@ void CudaCalcCustomManyParticleForceKernel::initialize(const System& system, con
} }
for (int i = 0; i < particlesPerSet; i++) { for (int i = 0; i < particlesPerSet; i++) {
if (hasTypeFilters) if (hasTypeFilters)
permute<<"int atom"<<(i+1)<<" = particleSet[particleOrder["<<numTypes<<"*order+"<<i<<"]];\n"; permute<<"int atom"<<(i+1)<<" = particleSet[particleOrder["<<particlesPerSet<<"*order+"<<i<<"]];\n";
else else
permute<<"int atom"<<(i+1)<<" = p"<<(i+1)<<";\n"; permute<<"int atom"<<(i+1)<<" = p"<<(i+1)<<";\n";
loadData<<"real3 pos"<<(i+1)<<" = trim(posq[atom"<<(i+1)<<"]);\n"; loadData<<"real3 pos"<<(i+1)<<" = trim(posq[atom"<<(i+1)<<"]);\n";
......
...@@ -4944,7 +4944,7 @@ void OpenCLCalcCustomManyParticleForceKernel::initialize(const System& system, c ...@@ -4944,7 +4944,7 @@ void OpenCLCalcCustomManyParticleForceKernel::initialize(const System& system, c
} }
for (int i = 0; i < particlesPerSet; i++) { for (int i = 0; i < particlesPerSet; i++) {
if (hasTypeFilters) if (hasTypeFilters)
permute<<"int atom"<<(i+1)<<" = particleSet[particleOrder["<<numTypes<<"*order+"<<i<<"]];\n"; permute<<"int atom"<<(i+1)<<" = particleSet[particleOrder["<<particlesPerSet<<"*order+"<<i<<"]];\n";
else else
permute<<"int atom"<<(i+1)<<" = p"<<(i+1)<<";\n"; permute<<"int atom"<<(i+1)<<" = p"<<(i+1)<<";\n";
loadData<<"real4 pos"<<(i+1)<<" = posq[atom"<<(i+1)<<"];\n"; loadData<<"real4 pos"<<(i+1)<<" = posq[atom"<<(i+1)<<"];\n";
......
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