yade-dev team mailing list archive

Thread
Date

[Branch ~yade-pkg/yade/git-trunk] Rev 3795: use FlowEngine's mask consistently

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Fri, 12 Feb 2016 00:07:25 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3795
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
timestamp: Thu 2016-02-11 19:44:23 +0100
message:
  use FlowEngine's mask consistently
modified:
  pkg/pfv/FlowEngine.ipp.in


--
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/pfv/FlowEngine.ipp.in'
--- pkg/pfv/FlowEngine.ipp.in	2016-02-10 17:09:03 +0000
+++ pkg/pfv/FlowEngine.ipp.in	2016-02-11 18:44:23 +0000
@@ -295,7 +295,7 @@
 	const int Sph_Index = sph->getClassIndexStatic();
 	FOREACH ( const shared_ptr<Body>& b, *scene->bodies ) {
 // 		if (!b || ignoredBody==b->getId() || b->isClumpMember()) continue;
-		if (!b || (mask<=0 or !b->maskCompatible(mask)) || b->isClumpMember()) continue;
+		if (!b || (mask>0 and !b->maskCompatible(mask)) || b->isClumpMember()) continue;
 		posData& dat = buffer[b->getId()];
 		dat.id=b->getId();
 		dat.pos=b->state->pos;