Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
d86dd9d1
"platforms/vscode:/vscode.git/clone" did not exist on "f18fa49cfce1a651f55753504b80db3d2ba163bf"
Commit
d86dd9d1
authored
Jun 28, 2018
by
Peter Eastman
Browse files
Bug fix
parent
41230a89
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
platforms/cuda/src/CudaKernels.cpp
platforms/cuda/src/CudaKernels.cpp
+3
-2
platforms/opencl/src/OpenCLKernels.cpp
platforms/opencl/src/OpenCLKernels.cpp
+3
-2
No files found.
platforms/cuda/src/CudaKernels.cpp
View file @
d86dd9d1
...
...
@@ -2023,7 +2023,7 @@ void CudaCalcNonbondedForceKernel::initialize(const System& system, const Nonbon
paramValues.resize(paramNames.size(), 0.0);
particleParamOffsets.initialize<float4>(cu, max(force.getNumParticleParameterOffsets(), 1), "particleParamOffsets");
exceptionParamOffsets.initialize<float4>(cu, max(force.getNumExceptionParameterOffsets(), 1), "exceptionParamOffsets");
particleOffsetIndices.initialize<int>(cu,
force.getNumParticle
s()+1, "particleOffsetIndices");
particleOffsetIndices.initialize<int>(cu,
cu.getPaddedNumAtom
s()+1, "particleOffsetIndices");
exceptionOffsetIndices.initialize<int>(cu, force.getNumExceptions()+1, "exceptionOffsetIndices");
vector<int> particleOffsetIndicesVec, exceptionOffsetIndicesVec;
vector<float4> p, e;
...
...
@@ -2032,6 +2032,7 @@ void CudaCalcNonbondedForceKernel::initialize(const System& system, const Nonbon
for (int j = 0; j < particleOffsetVec[i].size(); j++)
p.push_back(particleOffsetVec[i][j]);
}
while (particleOffsetIndicesVec.size() < particleOffsetIndices.getSize())
particleOffsetIndicesVec.push_back(p.size());
for (int i = 0; i < exceptionOffsetVec.size(); i++) {
exceptionOffsetIndicesVec.push_back(e.size());
...
...
platforms/opencl/src/OpenCLKernels.cpp
View file @
d86dd9d1
...
...
@@ -1955,7 +1955,7 @@ void OpenCLCalcNonbondedForceKernel::initialize(const System& system, const Nonb
paramValues.resize(paramNames.size(), 0.0);
particleParamOffsets.initialize<mm_float4>(cl, max(force.getNumParticleParameterOffsets(), 1), "particleParamOffsets");
exceptionParamOffsets.initialize<mm_float4>(cl, max(force.getNumExceptionParameterOffsets(), 1), "exceptionParamOffsets");
particleOffsetIndices.initialize<cl_int>(cl,
force.getNumParticle
s()+1, "particleOffsetIndices");
particleOffsetIndices.initialize<cl_int>(cl,
cl.getPaddedNumAtom
s()+1, "particleOffsetIndices");
exceptionOffsetIndices.initialize<cl_int>(cl, force.getNumExceptions()+1, "exceptionOffsetIndices");
vector<cl_int> particleOffsetIndicesVec, exceptionOffsetIndicesVec;
vector<mm_float4> p, e;
...
...
@@ -1964,6 +1964,7 @@ void OpenCLCalcNonbondedForceKernel::initialize(const System& system, const Nonb
for (int j = 0; j < particleOffsetVec[i].size(); j++)
p.push_back(particleOffsetVec[i][j]);
}
while (particleOffsetIndicesVec.size() < particleOffsetIndices.getSize())
particleOffsetIndicesVec.push_back(p.size());
for (int i = 0; i < exceptionOffsetVec.size(); i++) {
exceptionOffsetIndicesVec.push_back(e.size());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment