yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2606
committer: Václav Šmilauer <eu@xxxxxxxx>
branch nick: yade
timestamp: Fri 2010-12-10 15:52:22 +0100
message:
  1. Fix orientation of rotations for ScGeom6D in LawTester
modified:
  pkg/dem/DomainLimiter.cpp
  scripts/test/clumpPack.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/dem/DomainLimiter.cpp'
--- pkg/dem/DomainLimiter.cpp	2010-12-10 10:13:47 +0000
+++ pkg/dem/DomainLimiter.cpp	2010-12-10 14:52:22 +0000
@@ -114,7 +114,7 @@
 				scGeom->rotate(shearTot);
 				shearTot+=scGeom->shearIncrement();
 				uGeom.start<3>()=Vector3r(-scGeom->penetrationDepth,shearTot.dot(axY),shearTot.dot(axZ));
-				if(scGeom6d) uGeom.end<3>()=Vector3r(scGeom6d->getTwist(),scGeom6d->getBending().dot(axY),scGeom6d->getBending().dot(axZ));
+				if(scGeom6d) uGeom.end<3>()=-1.*Vector3r(scGeom6d->getTwist(),scGeom6d->getBending().dot(axY),scGeom6d->getBending().dot(axZ));
 			}
 			else{ // d3dGeom
 				throw runtime_error("LawTester: Dem3DofGeom not yet supported.");
@@ -132,7 +132,7 @@
 		if(l6Geom) uGeom.end<3>()=l6Geom->phi;
 	}
 	// perform all shearing by translation, as it does not induce bending
-	if(hasRot && rotWeight!=0){ LOG_INFO("LawTester.rotWeight set to 0 (was"<<rotWeight<<"), since rotational DoFs are in use."); rotWeight=0; }
+	if(hasRot && rotWeight!=0){ LOG_INFO("LawTester.rotWeight set to 0 (was "<<rotWeight<<"), since rotational DoFs are in use."); rotWeight=0; }
 	contPt=gsc->contactPoint;
 	refLength=gsc->refR1+gsc->refR2;
 	renderLength=.5*refLength;

=== modified file 'scripts/test/clumpPack.py'
--- scripts/test/clumpPack.py	2010-11-11 14:22:33 +0000
+++ scripts/test/clumpPack.py	2010-12-10 14:52:22 +0000
@@ -9,6 +9,7 @@
 O.bodies.append(utils.wall(position=0,axis=2))
 
 O.engines=[
+	SubdomainOptimizer(),
 	ForceResetter(),
 	InsertionSortCollider([Bo1_Sphere_Aabb(),Bo1_Wall_Aabb()]),
 	InteractionLoop(
@@ -21,4 +22,5 @@
 ]
 O.dt=.7*utils.PWaveTimeStep()
 O.saveTmp()
+O.step()