← Back to team overview

yade-dev team mailing list archive

[Branch ~yade-dev/yade/trunk] Rev 2306: 1. Some small fixes

 

------------------------------------------------------------
revno: 2306
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-06-30 00:46:24 +0200
message:
  1. Some small fixes
renamed:
  examples/exact-rot-facet.py => scripts/exact-rot-facet.py
  examples/exact-rot.py => scripts/exact-rot.py
modified:
  examples/constitutive-law.py
  py/ymport.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 'examples/constitutive-law.py'
--- examples/constitutive-law.py	2010-05-29 20:52:10 +0000
+++ examples/constitutive-law.py	2010-06-29 22:46:24 +0000
@@ -17,7 +17,7 @@
 
 for n in range(30):
 	O.bodies.append(utils.sphere([0,n,0],.50001,dynamic=(n>0),color=[1-(n/20.),n/20.,0]))
-O.bodies[len(O.bodies)-1].isDynamic=False
+O.bodies[len(O.bodies)-1].dynamic=False
 #	# looks for metaengine found in Omega() and uses those
 #	if n>0: utils.createInteraction(n-1,n)
 #for i in O.interactions: i.phys['ks']=1e9

=== modified file 'py/ymport.py'
--- py/ymport.py	2010-06-29 21:36:43 +0000
+++ py/ymport.py	2010-06-29 22:46:24 +0000
@@ -34,11 +34,11 @@
 		elif (data[0][0] == "#"): continue
 		
 		if (format=='x_y_z_r'):
-			pos = Vector3(float(data[0],float(data[1],float(data[2])
+			pos = Vector3(float(data[0]),float(data[1]),float(data[2]))
 			ret.append(utils.sphere(shift+scale*pos,scale*float(data[3]),**kw))
 			
 		elif (format=='x_y_z_r_matId'):
-			pos = Vector3(float(data[0],float(data[1],float(data[2])
+			pos = Vector3(float(data[0]),float(data[1]),float(data[2]))
 			ret.append(utils.sphere(shift+scale*pos,scale*float(data[3]),material=int(data[4]),**kw))
 			
 		else:

=== renamed file 'examples/exact-rot-facet.py' => 'scripts/exact-rot-facet.py'
=== renamed file 'examples/exact-rot.py' => 'scripts/exact-rot.py'