yade-dev team mailing list archive

Thread
Date

[Branch ~yade-pkg/yade/git-trunk] Rev 4120: Return false in BubbleMat, if no penetration.

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 28 Jul 2014 08:39:21 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 4120
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Mon 2014-07-28 08:41:18 +0200
message:
  Return false in BubbleMat, if no penetration.
modified:
  pkg/dem/BubbleMat.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/dem/BubbleMat.cpp'
--- pkg/dem/BubbleMat.cpp	2014-07-28 06:24:36 +0000
+++ pkg/dem/BubbleMat.cpp	2014-07-28 06:41:18 +0000
@@ -65,8 +65,7 @@
 	BubblePhys* phys=static_cast<BubblePhys*>(_phys.get());
 	
 	if(geom->penetrationDepth <= 0.0) {
-		scene->interactions->requestErase(I);
-		return;
+		return false;
 	}
 	
 	if (I->isFresh(scene)) {