yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2859
committer: jduriez <jduriez@c1solimara-l>
branch nick: yade
timestamp: Wed 2011-05-11 11:40:28 +0200
message:
  - add of a "by" in doc
  - re let work the .py, modifiying definition of state.blockedDOFS
modified:
  pkg/dem/NormalInelasticityLaw.hpp
  scripts/test/chained-cylinder-roots.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/NormalInelasticityLaw.hpp'
--- pkg/dem/NormalInelasticityLaw.hpp	2011-05-04 12:37:24 +0000
+++ pkg/dem/NormalInelasticityLaw.hpp	2011-05-11 09:40:28 +0000
@@ -35,7 +35,7 @@
 				LawFunctor,
 				"Contact law used to simulate granular filler in rock joints [Duriez2009a]_, [Duriez2011]_. It includes possibility of cohesion, moment transfer and inelastic compression behaviour (to reproduce the normal inelasticity observed for rock joints, for the latter).\n\n The moment transfer relation corresponds to the adaptation of the work of Plassiard & Belheine (see in [DeghmReport2006]_ for example), which was realized by J. Kozicki, and is now coded in :yref:`ScGeom6D`.\n\n As others :yref:`LawFunctor`, it uses pre-computed data of the interactions (rigidities, friction angles -with their tan()-, orientations of the interactions); this work is done here in :yref:`Ip2_2xNormalInelasticMat_NormalInelasticityPhys`.\n\n To use this you should also use :yref:`NormalInelasticMat` as material type of the bodies.\n\n The effects of this law are illustrated in examples/normalInelasticityTest.py",
 				((bool,momentRotationLaw,true,,"boolean, true=> computation of a torque (against relative rotation) exchanged between particles"))
-				((bool,momentAlwaysElastic,false,,"boolean, true=> the part of the contact torque (caused relative rotations, which is computed only if momentRotationLaw..) is not limited by a plastic threshold"))
+				((bool,momentAlwaysElastic,false,,"boolean, true=> the part of the contact torque (caused by relative rotations, which is computed only if momentRotationLaw..) is not limited by a plastic threshold"))
 				,
 				moment=Vector3r::Zero();
 				f=Vector3r::Zero();

=== modified file 'scripts/test/chained-cylinder-roots.py'
--- scripts/test/chained-cylinder-roots.py	2010-12-15 10:11:41 +0000
+++ scripts/test/chained-cylinder-roots.py	2011-05-11 09:40:28 +0000
@@ -75,7 +75,7 @@
 		if (i == Ne-1): #close the chain with a node of size 0
 			print "closing chain"
 			b=utils.chainedCylinder(begin=Vector3(pz2,py2,px2), radius=0.02,end=Vector3(pz2,py2,px2),color=Vector3(0.6,0.5,0.5),material='cylindermat')
-			b.state.blockedDOFs=['x','y','z','rx','ry','rz']
+			b.state.blockedDOFs='xyzXYZ'
 	ChainedState.currentChain=ChainedState.currentChain+1
 
 O.saveTmp()