Skip to content

GitLab

Commit 1e5b258c authored by peastman's avatar peastman Committed by GitHub
Browse files

Merge pull request #1692 from peastman/mergedsteps 

Fixed bug merging steps in CustomIntegrator
parents 88b0a3e9 74dba059
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
platforms/cuda/src/CudaKernels.cpp
View file @ 1e5b258c
......@@ -7098,7 +7098,7 @@ void CudaIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context,
// Identify steps that can be merged into a single kernel.
for (int step = 1; step < numSteps; step++) {
if ((needsForces[step] || needsEnergy[step]) && (invalidatesForces[step-1] || forceGroupFlags[step] != forceGroupFlags[step-1]))
if (invalidatesForces[step-1] || forceGroupFlags[step] != forceGroupFlags[step-1])
continue;
if (stepType[step-1] == CustomIntegrator::ComputePerDof && stepType[step] == CustomIntegrator::ComputePerDof)
merged[step] = true;
......
platforms/opencl/src/OpenCLKernels.cpp
View file @ 1e5b258c
......@@ -7387,7 +7387,7 @@ void OpenCLIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context
// Identify steps that can be merged into a single kernel.
for (int step = 1; step < numSteps; step++) {
if ((needsForces[step] || needsEnergy[step]) && (invalidatesForces[step-1] || forceGroupFlags[step] != forceGroupFlags[step-1]))
if (invalidatesForces[step-1] || forceGroupFlags[step] != forceGroupFlags[step-1])
continue;
if (stepType[step-1] == CustomIntegrator::ComputePerDof && stepType[step] == CustomIntegrator::ComputePerDof)
merged[step] = true;
......
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