When we are asked to produce no force on a Surface (e.g. a weight that

is "off"), make sure the force is actually zero.  Kind of a hack -- a
better idea would be flag to set at a higher level.

diff --git a/src/FDM/YASim/Surface.cpp b/src/FDM/YASim/Surface.cpp
index 24d318842dea996ac412b9b83609085983274685..8e7bafaa65790f8f4c93f580e7c3357418e07eb8 100644 (file)
--- a/src/FDM/YASim/Surface.cpp
+++ b/src/FDM/YASim/Surface.cpp
@@ -158,6 +158,13 @@ void Surface::calcForce(float* v, float rho, float* out, float* torque)
        return;
     }
 
+    // special case this so the logic below doesn't produce a non-zero
+    // force; should probably have a "no force" flag instead...
+    if(_cx == 0. && _cy == 0. && _cz == 0.) {
+        for(int i=0; i<3; i++) out[i] = torque[i] = 0.;
+        return;
+    }
+
     Math::mul3(1/vel, v, out);
 
     // Convert to the surface's coordinates