yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1717
committer: Václav Šmilauer <vaclav@flux>
branch nick: trunk
timestamp: Fri 2009-08-21 16:14:26 +0200
message:
  Avoid error in pack.triaxialTest if compiled without GTS.
modified:
  py/pack.py
  scripts/test/collider-stride.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 'py/pack.py'
--- py/pack.py	2009-08-21 11:59:41 +0000
+++ py/pack.py	2009-08-21 14:14:26 +0000
@@ -225,7 +225,7 @@
 	from yade import log
 	from math import pi
 	wantPeri=(spheresInCell>0)
-	if type(predicate)==inGtsSurface and useOBB:
+	if 'inGtsSurface' in dir() and type(predicate)==inGtsSurface and useOBB:
 		center,dim,orientation=gtsSurfaceBestFitOBB(predicate.surf)
 		dim*=2 # gtsSurfaceBestFitOBB returns halfSize
 	else:

=== modified file 'scripts/test/collider-stride.py'
--- scripts/test/collider-stride.py	2009-07-10 08:52:33 +0000
+++ scripts/test/collider-stride.py	2009-08-21 14:14:26 +0000
@@ -29,9 +29,8 @@
 except ImportError: pass
 
 O.timingEnabled=True
-isc['stride']=3
-isc['sweepTimeFactor']=1.1
-isc['sweepVelocity']=1000
+isc['sweepLength']=.1
+isc['nBins']=5
 #log.setLevel('InsertionSortCollider',log.DEBUG)
 #log.setLevel('BoundingVolumeMetaEngine',log.DEBUG)
 O.saveTmp()