Skip to content

GitLab

Commit 228083e3 authored by peastman's avatar peastman Committed by GitHub
Browse files

Merge pull request #1694 from peastman/storeposasdelta 

Fixed bug in CustomIntegrator
parents 1e5b258c 12046dc5
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
platforms/cuda/src/CudaKernels.cpp
View file @ 228083e3
...@@ -7082,8 +7082,10 @@ void CudaIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context, ...@@ -7082,8 +7082,10 @@ void CudaIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context,
for (int step = numSteps-1; step >= 0; step--) { for (int step = numSteps-1; step >= 0; step--) {
if (stepType[step] == CustomIntegrator::ConstrainPositions) if (stepType[step] == CustomIntegrator::ConstrainPositions)
beforeConstrain = true; beforeConstrain = true;
else if (stepType[step] == CustomIntegrator::ComputePerDof && variable[step] == "x" && beforeConstrain) else if (stepType[step] == CustomIntegrator::ComputePerDof && variable[step] == "x" && beforeConstrain) {
storePosAsDelta[step] = true; storePosAsDelta[step] = true;
beforeConstrain = false;
}
} }
bool storedAsDelta = false; bool storedAsDelta = false;
for (int step = 0; step < numSteps; step++) { for (int step = 0; step < numSteps; step++) {
......
platforms/opencl/src/OpenCLKernels.cpp
View file @ 228083e3
...@@ -7371,8 +7371,10 @@ void OpenCLIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context ...@@ -7371,8 +7371,10 @@ void OpenCLIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context
for (int step = numSteps-1; step >= 0; step--) { for (int step = numSteps-1; step >= 0; step--) {
if (stepType[step] == CustomIntegrator::ConstrainPositions) if (stepType[step] == CustomIntegrator::ConstrainPositions)
beforeConstrain = true; beforeConstrain = true;
else if (stepType[step] == CustomIntegrator::ComputePerDof && variable[step] == "x" && beforeConstrain) else if (stepType[step] == CustomIntegrator::ComputePerDof && variable[step] == "x" && beforeConstrain) {
storePosAsDelta[step] = true; storePosAsDelta[step] = true;
beforeConstrain = false;
}
} }
bool storedAsDelta = false; bool storedAsDelta = false;
for (int step = 0; step < numSteps; step++) { for (int step = 0; step < numSteps; step++) {
......
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