yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2323
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-07-05 19:05:41 +0200
message:
  Fix Facet AABB computation in periodic scenes (another important update!)
modified:
  pkg/common/Engine/Functor/Bo1_Facet_Aabb.cpp
  scripts/test/periodic-shear.py


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

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

=== modified file 'pkg/common/Engine/Functor/Bo1_Facet_Aabb.cpp'
--- pkg/common/Engine/Functor/Bo1_Facet_Aabb.cpp	2010-06-08 22:25:00 +0000
+++ pkg/common/Engine/Functor/Bo1_Facet_Aabb.cpp	2010-07-05 17:05:41 +0000
@@ -13,7 +13,7 @@
 void Bo1_Facet_Aabb::go(	  const shared_ptr<Shape>& cm
 				, shared_ptr<Bound>& bv
 				, const Se3r& se3
-				, const Body*	)
+				, const Body*)
 {
 	Aabb* aabb = static_cast<Aabb*>(bv.get());
 	Facet* facet = static_cast<Facet*>(cm.get());
@@ -34,7 +34,7 @@
 		for(int i=0; i<3; i++){
 			Vector3r v=scene->cell->unshearPt(O+facetAxisT*vertices[i]);
 			aabb->min=aabb->min.cwise().min(v);
-			aabb->max=aabb->min.cwise().max(v);
+			aabb->max=aabb->max.cwise().max(v);
 		}
 	}
 }

=== modified file 'scripts/test/periodic-shear.py'
--- scripts/test/periodic-shear.py	2010-07-05 16:34:20 +0000
+++ scripts/test/periodic-shear.py	2010-07-05 17:05:41 +0000
@@ -1,8 +1,8 @@
 O.periodic=True
 O.cell.refSize=Vector3(.55,.55,.55)
-#O.bodies.append(utils.facet([[.4,.0001,.3],[.2,.0001,.3],[.3,.2,.2]]))
+O.bodies.append(utils.facet([[.4,.0001,.3],[.2,.0001,.3],[.3,.2,.2]]))
 O.bodies.append(utils.sphere([.3,.1,.4],.05,dynamic=True))
-#O.bodies.append(utils.sphere([.200001,.2000001,.4],.05,dynamic=False))
+O.bodies.append(utils.sphere([.200001,.2000001,.4],.05,dynamic=False))
 O.bodies.append(utils.sphere([.3,0,0],.1,dynamic=False))
 O.engines=[
 	ForceResetter(),
@@ -33,7 +33,7 @@
 O.saveTmp()
 rrr=yade.qt.Renderer()
 rrr.intrAllWire,rrr.bound=True,True
-isc.watch1,isc.watch2=0,-1
+#isc.watch1,isc.watch2=0,-1
 
 #from yade import log
 #import yade.qt,time
@@ -43,4 +43,5 @@
 
 from yade import log
 #log.setLevel('Shop',log.TRACE)
-log.setLevel('InsertionSortCollider',log.TRACE)
+#log.setLevel('InsertionSortCollider',log.TRACE)
+