yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3689
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Fri 2015-06-19 15:19:11 +0200
message:
  Fix SPH force calculation between clump members.
modified:
  pkg/common/SPHEngine.cpp


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'pkg/common/SPHEngine.cpp'
--- pkg/common/SPHEngine.cpp	2015-06-11 07:54:08 +0000
+++ pkg/common/SPHEngine.cpp	2015-06-19 13:19:11 +0000
@@ -228,7 +228,8 @@
   
   const BodyContainer& bodies = *scene->bodies;
   
-  if (bodies[id1]->clumpId!=bodies[id2]->clumpId) {
+  if (bodies[id1]->isClumpMember() and bodies[id2]->isClumpMember() and
+      bodies[id1]->clumpId==bodies[id2]->clumpId) {
     //If 2 bodies belong to the same clump, do not calculate forces
     force = Vector3r::Zero();
     return true;