Merge pull request #2554 from peastman/constraint

Fixed inconsistency between plaforms in constraints with CustomIntegrator

Merge pull request #2554 from peastman/constraint
Fixed inconsistency between plaforms in constraints with CustomIntegrator
b994ed24 · peastman · GitHub · ff555815 · 1d88314e · b994ed24
Unverified Commit b994ed24 authored Feb 05, 2020 by peastman Committed by GitHub Feb 05, 2020
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

platforms/common/src/CommonKernels.cpp platforms/common/src/CommonKernels.cpp +1 -3

No files found.
--- a/platforms/common/src/CommonKernels.cpp
+++ b/platforms/common/src/CommonKernels.cpp
@@ -6265,10 +6265,8 @@ void CommonIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context
            for (int step = numSteps-1; step >= 0; step--) {
                if (stepType[step] == CustomIntegrator::ConstrainPositions)
                    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;
-                    beforeConstrain = false;
-                }
            }
            bool storedAsDelta = false;
            for (int step = 0; step < numSteps; step++) {