yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2470
committer: bchareyre <bchareyre@dt-rv020>
branch nick: yade
timestamp: Mon 2010-10-11 16:19:48 +0200
message:
  -Update functor->momentLaw in the global engine. 
modified:
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp


--
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/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp'
--- pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp	2010-09-30 18:00:41 +0000
+++ pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp	2010-10-11 14:19:48 +0000
@@ -31,6 +31,7 @@
 	functor->twist_creep=twist_creep;
 	functor->creep_viscosity = creep_viscosity;
 	functor->scene=scene;
+	functor->momentRotationLaw=momentRotationLaw;
 	
 	FOREACH(const shared_ptr<Interaction>& I, *scene->interactions){
 		if(!I->isReal()) continue;
@@ -53,7 +54,6 @@
 	Body* b2 = Body::byId(id2,scene).get();
 	ScGeom* currentContactGeometry  = YADE_CAST<ScGeom*> (ig.get());
 	CohFrictPhys* currentContactPhysics = YADE_CAST<CohFrictPhys*> (ip.get());
-
 	Vector3r& shearForce    = currentContactPhysics->shearForce;
 
 	if (contact->isFresh(scene)) shearForce   = Vector3r::Zero();