yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #02507
[Branch ~yade-dev/yade/trunk] Rev 1854: 1. Fix many warnings in various parts of python code related to renaming.
------------------------------------------------------------
revno: 1854
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Sat 2009-12-05 00:27:26 +0100
message:
1. Fix many warnings in various parts of python code related to renaming.
modified:
examples/STLImporterTest.py
examples/buldozer.py
examples/buldozerVTK.py
examples/concrete/uniax.py
examples/cyl.py
examples/dynamic_simulation_tests/ringCundallDamping.py
examples/dynamic_simulation_tests/ringSimpleViscoelastic.py
examples/mill.py
examples/rod_penetration/model.py
py/pack.py
py/utils.py
py/ymport.py
scripts/chain-distant-interactions.py
scripts/constitutive-law.py
scripts/cylindrical-layer-packing.py
scripts/exact-rot-facet.py
scripts/exact-rot.py
scripts/multi.py
scripts/simple-scene-graph.py
scripts/simple-scene-parallel.py
scripts/simple-scene-player.py
scripts/simple-scene-video.py
scripts/simple-scene.py
scripts/test-sphere-facet-corner.py
scripts/test-sphere-facet.py
scripts/test/Dem3DofGeom.py
scripts/test/ResetRandomPosition.py
scripts/test/SpheresFactory/model.py
scripts/test/clump-hopper-viscoelastic.py
scripts/test/clump-inbox-viscoelastic.py
scripts/test/clump-viscoelastic.py
scripts/test/clump.py
scripts/test/collider-stride.py
scripts/test/collider-sweep-simple.py
scripts/test/facet-sphere.py
scripts/test/gts-horse.py
scripts/test/insertion-sort-collider.py
scripts/test/interpolating-force.py
scripts/test/pack-cloud.py
scripts/test/periodic-compress.py
scripts/test/periodic-grow.py
scripts/test/periodic-simple.py
scripts/test/regular-sphere-pack.py
scripts/test/remove-body.py
scripts/test/shear.py
scripts/test/wall.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/STLImporterTest.py'
--- examples/STLImporterTest.py 2009-11-24 19:12:10 +0000
+++ examples/STLImporterTest.py 2009-12-04 23:27:26 +0000
@@ -38,16 +38,16 @@
## Resets forces and momenta the act on bodies
BexResetter(),
## Associates bounding volume to each body.
- BoundingVolumeMetaEngine([ InteractingSphere2AABB(), InteractingFacet2AABB() ]),
+ BoundDispatcher([ InteractingSphere2AABB(), InteractingFacet2AABB() ]),
## Using bounding boxes find possible body collisions.
InsertionSortCollider(),
## Create geometry information about each potential collision.
- InteractionGeometryMetaEngine([
+ InteractionGeometryDispatcher([
InteractingSphere2InteractingSphere4SpheresContactGeometry(),
InteractingFacet2InteractingSphere4SpheresContactGeometry()
]),
## Create physical information about the interaction.
- InteractionPhysicsMetaEngine([
+ InteractionPhysicsDispatcher([
Ip2_SimleViscoelasticMat_SimpleViscoelasticMat_SimpleViscoelasticPhys()
]),
## Constitutive law
=== modified file 'examples/buldozer.py'
--- examples/buldozer.py 2009-09-18 14:54:34 +0000
+++ examples/buldozer.py 2009-12-04 23:27:26 +0000
@@ -59,7 +59,7 @@
O.dt=2*utils.PWaveTimeStep() # We do not need now a high accuracy
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[ef2_Sphere_Sphere_Dem3DofGeom(),ef2_Facet_Sphere_Dem3DofGeom()],
=== modified file 'examples/buldozerVTK.py'
--- examples/buldozerVTK.py 2009-10-05 20:07:25 +0000
+++ examples/buldozerVTK.py 2009-12-04 23:27:26 +0000
@@ -55,11 +55,11 @@
O.dt=.2*tc
-O.initializers=[ BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]) ]
+O.initializers=[ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]) ]
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[InteractingSphere2InteractingSphere4SpheresContactGeometry(), InteractingFacet2InteractingSphere4SpheresContactGeometry()],
=== modified file 'examples/concrete/uniax.py'
--- examples/concrete/uniax.py 2009-11-29 15:46:19 +0000
+++ examples/concrete/uniax.py 2009-12-04 23:27:26 +0000
@@ -78,7 +78,7 @@
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(aabbEnlargeFactor=intRadius,label='is2aabb'),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(aabbEnlargeFactor=intRadius,label='is2aabb'),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(sweepLength=.05*sphereRadius,nBins=5,binCoeff=5),
InteractionDispatchers(
[ef2_Sphere_Sphere_Dem3DofGeom(distFactor=intRadius,label='ss2d3dg')],
=== modified file 'examples/cyl.py'
--- examples/cyl.py 2009-09-02 15:40:53 +0000
+++ examples/cyl.py 2009-12-04 23:27:26 +0000
@@ -37,7 +37,7 @@
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(nBins=5,sweepLength=.1*rMean),
InteractionDispatchers(
[ef2_Sphere_Sphere_Dem3DofGeom(),ef2_Facet_Sphere_Dem3DofGeom()],
=== modified file 'examples/dynamic_simulation_tests/ringCundallDamping.py'
--- examples/dynamic_simulation_tests/ringCundallDamping.py 2009-11-17 12:26:35 +0000
+++ examples/dynamic_simulation_tests/ringCundallDamping.py 2009-12-04 23:27:26 +0000
@@ -35,7 +35,7 @@
## Initializers
o.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
]
## Engines
@@ -44,7 +44,7 @@
BexResetter(),
## Associates bounding volume to each body.
- BoundingVolumeMetaEngine([
+ BoundDispatcher([
InteractingSphere2AABB(),
InteractingFacet2AABB(),
MetaInteractingGeometry2AABB()
@@ -54,13 +54,13 @@
InsertionSortCollider(),
## Create geometry information about each potential collision.
- InteractionGeometryMetaEngine([
+ InteractionGeometryDispatcher([
InteractingSphere2InteractingSphere4SpheresContactGeometry(),
InteractingFacet2InteractingSphere4SpheresContactGeometry()
]),
## Create physical information about the interaction.
- InteractionPhysicsMetaEngine([MacroMicroElasticRelationships()]),
+ InteractionPhysicsDispatcher([MacroMicroElasticRelationships()]),
## Constitutive law
ElasticContactLaw(),
=== modified file 'examples/dynamic_simulation_tests/ringSimpleViscoelastic.py'
--- examples/dynamic_simulation_tests/ringSimpleViscoelastic.py 2009-11-17 12:26:35 +0000
+++ examples/dynamic_simulation_tests/ringSimpleViscoelastic.py 2009-12-04 23:27:26 +0000
@@ -41,7 +41,7 @@
## Initializers
o.initializers=[
## Create bounding boxes. They are needed to zoom the 3d view properly before we start the simulation.
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
]
## Engines
@@ -50,7 +50,7 @@
BexResetter(),
## Associates bounding volume to each body.
- BoundingVolumeMetaEngine([
+ BoundDispatcher([
InteractingSphere2AABB(),
InteractingFacet2AABB(),
MetaInteractingGeometry2AABB()
@@ -60,13 +60,13 @@
InsertionSortCollider(),
## Create geometry information about each potential collision.
- InteractionGeometryMetaEngine([
+ InteractionGeometryDispatcher([
InteractingSphere2InteractingSphere4SpheresContactGeometry(),
InteractingFacet2InteractingSphere4SpheresContactGeometry()
]),
## Create physical information about the interaction.
- InteractionPhysicsMetaEngine([SimpleViscoelasticRelationships()]),
+ InteractionPhysicsDispatcher([SimpleViscoelasticRelationships()]),
## Constitutive law
ConstitutiveLawDispatcher([ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw()]),
=== modified file 'examples/mill.py'
--- examples/mill.py 2009-09-01 09:01:20 +0000
+++ examples/mill.py 2009-12-04 23:27:26 +0000
@@ -61,7 +61,7 @@
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[ef2_Sphere_Sphere_Dem3DofGeom(),ef2_Facet_Sphere_Dem3DofGeom()],
=== modified file 'examples/rod_penetration/model.py'
--- examples/rod_penetration/model.py 2009-08-10 16:59:33 +0000
+++ examples/rod_penetration/model.py 2009-12-04 23:27:26 +0000
@@ -45,7 +45,7 @@
## Initializers
o.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
]
## Engines
@@ -54,7 +54,7 @@
BexResetter(),
## Associates bounding volume to each body.
- BoundingVolumeMetaEngine([
+ BoundDispatcher([
InteractingSphere2AABB(),
InteractingFacet2AABB(),
MetaInteractingGeometry2AABB()
@@ -62,12 +62,12 @@
## Using bounding boxes find possible body collisions.
InsertionSortCollider(),
## Create geometry information about each potential collision.
- InteractionGeometryMetaEngine([
+ InteractionGeometryDispatcher([
InteractingSphere2InteractingSphere4SpheresContactGeometry(),
InteractingFacet2InteractingSphere4SpheresContactGeometry()
]),
## Create physical information about the interaction.
- InteractionPhysicsMetaEngine([MacroMicroElasticRelationships()]),
+ InteractionPhysicsDispatcher([MacroMicroElasticRelationships()]),
## Constitutive law
ElasticContactLaw(),
## Apply gravity
=== modified file 'py/pack.py'
--- py/pack.py 2009-12-04 23:07:34 +0000
+++ py/pack.py 2009-12-04 23:27:26 +0000
@@ -308,7 +308,7 @@
#print cloudPorosity,beta,gamma,N100,x1,y1,z1,O.periodicCell
#print x1,y1,z1,radius,rRelFuzz
num=sp.makeCloud(O.periodicCell[0],O.periodicCell[1],radius,rRelFuzz,spheresInCell,True)
- O.engines=[BexResetter(),BoundingVolumeMetaEngine([InteractingSphere2AABB()]),InsertionSortCollider(nBins=5,sweepLength=.05*radius),InteractionDispatchers([ef2_Sphere_Sphere_Dem3DofGeom()],[SimpleElasticRelationships()],[Law2_Dem3Dof_Elastic_Elastic()]),PeriIsoCompressor(charLen=radius/5.,stresses=[100e9,1e8],maxUnbalanced=1e-2,doneHook='O.pause();',globalUpdateInt=5,keepProportions=True),NewtonsDampedLaw(damping=.6)]
+ O.engines=[BexResetter(),BoundDispatcher([InteractingSphere2AABB()]),InsertionSortCollider(nBins=5,sweepLength=.05*radius),InteractionDispatchers([ef2_Sphere_Sphere_Dem3DofGeom()],[SimpleElasticRelationships()],[Law2_Dem3Dof_Elastic_Elastic()]),PeriIsoCompressor(charLen=radius/5.,stresses=[100e9,1e8],maxUnbalanced=1e-2,doneHook='O.pause();',globalUpdateInt=5,keepProportions=True),NewtonsDampedLaw(damping=.6)]
O.materials.append(GranularMat(young=30e9,frictionAngle=.5,poisson=.3,density=1e3))
for s in sp: O.bodies.append(utils.sphere(s[0],s[1]))
O.dt=utils.PWaveTimeStep()
=== modified file 'py/utils.py'
--- py/utils.py 2009-12-04 23:07:34 +0000
+++ py/utils.py 2009-12-04 23:27:26 +0000
@@ -89,7 +89,7 @@
mass=volume*b.mat['density']
b.state['mass'],b.state['inertia']=mass,geomInertia*b.mat['density']
b['id']=-1
- if not noBound: b.bound=BoundingVolume('AABB',diffuseColor=[0,1,0])
+ if not noBound: b.bound=Bound('AABB',diffuseColor=[0,1,0])
def sphere(center,radius,dynamic=True,wire=False,color=None,highlight=False,material=0):
"""Create sphere with given parameters; mass and inertia computed automatically.
@@ -122,7 +122,7 @@
See utils.sphere's documentation for meaning of other parameters."""
b=Body()
- b.shape=InteractingGeometry('InteractingBox',extents=extents,diffuseColor=color if color else randomColor(),wire=wire,highlight=highlight)
+ b.shape=Shape('InteractingBox',extents=extents,diffuseColor=color if color else randomColor(),wire=wire,highlight=highlight)
V=8*extents[0]*extents[1]*extents[2]
geomInert=Vector3(4*(extents[1]**2+extents[2]**2),4*(extents[0]**2+extents[2]**2),4*(extents[0]**2+extents[1]**2))
_commonBodySetup(b,V,geomInert,material)
@@ -152,13 +152,13 @@
b.dynamic=False
return b
-def facet(vertices,dynamic=False,wire=True,color=None,highlight=False,noBoundingVolume=False,material=0):
+def facet(vertices,dynamic=False,wire=True,color=None,highlight=False,noBound=False,material=0):
"""Create facet with given parameters.
:Parameters:
`vertices`: [Vector3,Vector3,Vector3]
coordinates of vertices in the global coordinate system.
- `noBoundingVolume`: do not assign Body().bound
+ `noBound`: do not assign Body().bound
See utils.sphere's documentation for meaning of other parameters."""
b=Body()
@@ -168,7 +168,7 @@
b.shape=Shape('InteractingFacet',diffuseColor=color if color else randomColor(),wire=wire,highlight=highlight)
b.shape['vertices']=vertices
b.shape.postProcessAttributes(True)
- _commonBodySetup(b,0,Vector3(0,0,0),material,noBound=noBoundingVolume)
+ _commonBodySetup(b,0,Vector3(0,0,0),material,noBound=noBound)
b.state.pos=b.state.refPos=center
b.dynamic=dynamic
return b
@@ -262,7 +262,7 @@
def randomizeColors(onlyDynamic=False):
- """Assign random colors to InteractingGeometry::diffuseColor.
+ """Assign random colors to Shape::diffuseColor.
If onlyDynamic is true, only dynamic bodies will have the color changed.
"""
=== modified file 'py/ymport.py'
--- py/ymport.py 2009-11-27 14:42:21 +0000
+++ py/ymport.py 2009-12-04 23:27:26 +0000
@@ -27,7 +27,7 @@
ret.append(id)
return ret
-def stl(file, dynamic=False,wire=True,color=None,highlight=False,noBoundingVolume=False,material=0):
+def stl(file, dynamic=False,wire=True,color=None,highlight=False,noBound=False,material=0):
""" Import geometry from stl file, create facets and return list of their ids."""
imp = STLImporter()
imp.open(file)
@@ -41,7 +41,7 @@
b.mold['diffuseColor']=color if color else utils.randomColor()
b.mold['wire']=wire
b.mold['highlight']=highlight
- utils._commonBodySetup(b,0,Vector3(0,0,0),noBound=noBoundingVolume,material=material,resetState=False)
+ utils._commonBodySetup(b,0,Vector3(0,0,0),noBound=noBound,material=material,resetState=False)
return imported
def gmsh(meshfile="file.mesh",**kw):
=== modified file 'scripts/chain-distant-interactions.py'
--- scripts/chain-distant-interactions.py 2009-11-17 12:26:35 +0000
+++ scripts/chain-distant-interactions.py 2009-12-04 23:27:26 +0000
@@ -3,15 +3,15 @@
o=Omega()
o.initializers=[
- BoundingVolumeMetaEngine([
+ BoundDispatcher([
InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()
]
o.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
InsertionSortCollider(),
- InteractionGeometryMetaEngine([InteractingSphere2InteractingSphere4SpheresContactGeometry(hasShear=True)]),
- InteractionPhysicsMetaEngine([SimpleElasticRelationships()]),
+ InteractionGeometryDispatcher([InteractingSphere2InteractingSphere4SpheresContactGeometry(hasShear=True)]),
+ InteractionPhysicsDispatcher([SimpleElasticRelationships()]),
ElasticContactLaw(isCohesive=True),
MomentEngine(subscribedBodies=[1],moment=(0,1000,0)),
GravityEngine(gravity=(0,0,1e-2)),
=== modified file 'scripts/constitutive-law.py'
--- scripts/constitutive-law.py 2009-11-17 12:26:35 +0000
+++ scripts/constitutive-law.py 2009-12-04 23:27:26 +0000
@@ -2,14 +2,14 @@
# -*- encoding=utf-8 -*-
O.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
]
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
- InteractionGeometryMetaEngine([InteractingSphere2InteractingSphere4SpheresContactGeometry()]),
- InteractionPhysicsMetaEngine([SimpleElasticRelationships()]),
+ InteractionGeometryDispatcher([InteractingSphere2InteractingSphere4SpheresContactGeometry()]),
+ InteractionPhysicsDispatcher([SimpleElasticRelationships()]),
ConstitutiveLawDispatcher([ef2_Spheres_Elastic_ElasticLaw()]),
GravityEngine(gravity=(0,0,-1000)),
NewtonsDampedLaw(damping=0.2)
=== modified file 'scripts/cylindrical-layer-packing.py'
--- scripts/cylindrical-layer-packing.py 2009-08-03 17:53:26 +0000
+++ scripts/cylindrical-layer-packing.py 2009-12-04 23:27:26 +0000
@@ -6,7 +6,7 @@
o=Omega()
# we will use this in both initializers and engines, so we save it to a temp variable to save typing
-aabbDispatcher=BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
+aabbDispatcher=BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
o.initializers=[aabbDispatcher]
@@ -14,8 +14,8 @@
BexResetter(),
aabbDispatcher,
InsertionSortCollider(),
- InteractionGeometryMetaEngine([InteractingSphere2InteractingSphere4SpheresContactGeometry(),InteractingBox2InteractingSphere4SpheresContactGeometry()]),
- InteractionPhysicsMetaEngine([SimpleElasticRelationships()]),
+ InteractionGeometryDispatcher([InteractingSphere2InteractingSphere4SpheresContactGeometry(),InteractingBox2InteractingSphere4SpheresContactGeometry()]),
+ InteractionPhysicsDispatcher([SimpleElasticRelationships()]),
ElasticContactLaw(),
GlobalStiffnessTimeStepper(defaultDt=1e-4,active=True,timeStepUpdateInterval=500),
AxialGravityEngine(axisPoint=(0,0,0),axisDirection=(1,0,0),acceleration=1e4),
=== modified file 'scripts/exact-rot-facet.py'
--- scripts/exact-rot-facet.py 2009-11-17 12:26:35 +0000
+++ scripts/exact-rot-facet.py 2009-12-04 23:27:26 +0000
@@ -6,17 +6,17 @@
from math import *
O.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB(),InteractingFacet2AABB()])
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB(),InteractingFacet2AABB()])
]
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB(),InteractingFacet2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB(),InteractingFacet2AABB()]),
InsertionSortCollider(),
- InteractionGeometryMetaEngine([
+ InteractionGeometryDispatcher([
InteractingSphere2InteractingSphere4SpheresContactGeometry(),
InteractingFacet2InteractingSphere4SpheresContactGeometry(),
]),
- InteractionPhysicsMetaEngine([SimpleElasticRelationships()]),
+ InteractionPhysicsDispatcher([SimpleElasticRelationships()]),
ElasticContactLaw(),
RotationEngine(subscribedBodies=[1],rotationAxis=[1,0,0],angularVelocity=.01),
NewtonsDampedLaw(damping=0.2)
=== modified file 'scripts/exact-rot.py'
--- scripts/exact-rot.py 2009-11-17 12:26:35 +0000
+++ scripts/exact-rot.py 2009-12-04 23:27:26 +0000
@@ -2,17 +2,17 @@
# -*- encoding=utf-8 -*-
from math import *
O.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
]
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
- InteractionGeometryMetaEngine([
+ InteractionGeometryDispatcher([
InteractingSphere2InteractingSphere4SpheresContactGeometry(),
InteractingFacet2InteractingSphere4SpheresContactGeometry(),
]),
- InteractionPhysicsMetaEngine([SimpleElasticRelationships()]),
+ InteractionPhysicsDispatcher([SimpleElasticRelationships()]),
ElasticContactLaw(),
GravityEngine(gravity=(0,0,-9.81)),
RotationEngine(subscribedBodies=[1],rotationAxis=(1,0,0),angularVelocity=.01),
=== modified file 'scripts/multi.py'
--- scripts/multi.py 2009-04-15 07:19:44 +0000
+++ scripts/multi.py 2009-12-04 23:27:26 +0000
@@ -8,11 +8,11 @@
o=Omega()
o.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
]
o.engines=[
PhysicalActionContainerReseter(),
- BoundingVolumeMetaEngine([
+ BoundDispatcher([
InteractingSphere2AABB(),
InteractingBox2AABB(),
MetaInteractingGeometry2AABB()
=== modified file 'scripts/simple-scene-graph.py'
--- scripts/simple-scene-graph.py 2009-07-29 07:00:56 +0000
+++ scripts/simple-scene-graph.py 2009-12-04 23:27:26 +0000
@@ -2,11 +2,11 @@
# -*- encoding=utf-8 -*-
O.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
]
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[InteractingSphere2InteractingSphere4SpheresContactGeometry(),InteractingBox2InteractingSphere4SpheresContactGeometry()],
=== modified file 'scripts/simple-scene-parallel.py'
--- scripts/simple-scene-parallel.py 2009-08-04 05:38:03 +0000
+++ scripts/simple-scene-parallel.py 2009-12-04 23:27:26 +0000
@@ -5,7 +5,7 @@
#
O.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
]
O.engines=[
# physical actions will not be needed until the contact law comes in;
@@ -28,10 +28,10 @@
# BexResetter will run in parallel with the second group of BoundingVolumeMEtaEngine+PersistentSAPCollider
BexResetter(),
# Engines within the group will be run serially, however
- [BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]), PersistentSAPCollider(),]
+ [BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]), PersistentSAPCollider(),]
]),
- InteractionGeometryMetaEngine([InteractingSphere2InteractingSphere4SpheresContactGeometry(),InteractingBox2InteractingSphere4SpheresContactGeometry()]),
- InteractionPhysicsMetaEngine([SimpleElasticRelationships()]),
+ InteractionGeometryDispatcher([InteractingSphere2InteractingSphere4SpheresContactGeometry(),InteractingBox2InteractingSphere4SpheresContactGeometry()]),
+ InteractionPhysicsDispatcher([SimpleElasticRelationships()]),
# the rest must also be run sequentially
# (contact law as well as gravity modify physical actions, which are, once computed, used in the integrator)
ElasticContactLaw(),
=== modified file 'scripts/simple-scene-player.py'
--- scripts/simple-scene-player.py 2009-07-31 09:53:44 +0000
+++ scripts/simple-scene-player.py 2009-12-04 23:27:26 +0000
@@ -2,11 +2,11 @@
# -*- encoding=utf-8 -*-
o=Omega()
o.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
]
o.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[InteractingSphere2InteractingSphere4SpheresContactGeometry(),InteractingBox2InteractingSphere4SpheresContactGeometry()],
=== modified file 'scripts/simple-scene-video.py'
--- scripts/simple-scene-video.py 2009-07-29 07:23:29 +0000
+++ scripts/simple-scene-video.py 2009-12-04 23:27:26 +0000
@@ -1,10 +1,10 @@
#!/usr/local/bin/yade-trunk -x
# -*- encoding=utf-8 -*-
-O.initializers=[BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])]
+O.initializers=[BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])]
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[InteractingSphere2InteractingSphere4SpheresContactGeometry(),InteractingBox2InteractingSphere4SpheresContactGeometry()],
=== modified file 'scripts/simple-scene.py'
--- scripts/simple-scene.py 2009-12-04 15:40:34 +0000
+++ scripts/simple-scene.py 2009-12-04 23:27:26 +0000
@@ -10,7 +10,7 @@
## Initializers are run before the simulation.
o.initializers=[
## Create bounding boxes. They are needed to zoom the 3d view properly before we start the simulation.
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
]
## Engines are called consecutively at each iteration. Their order matters.
@@ -24,7 +24,7 @@
## associates bounding volume - in this case, AxisAlignedBoundingBox (AABB) - to each body.
## MetaEngine calls corresponding EngineUnit, depending on whether the body is Sphere, Box, or MetaBody (rootBody).
## AABBs will be used to detect collisions later, by PersistentSAPCollider
- BoundingVolumeMetaEngine([
+ BoundDispatcher([
InteractingSphere2AABB(),
InteractingBox2AABB(),
MetaInteractingGeometry2AABB()
@@ -35,7 +35,7 @@
## Decide whether the potential collisions are real; if so, create geometry information about each potential collision.
## Here, the decision about which EngineUnit to use depends on types of _both_ bodies.
## Note that there is no EngineUnit for box-box collision. They are not implemented.
- InteractionGeometryMetaEngine([
+ InteractionGeometryDispatcher([
InteractingSphere2InteractingSphere4SpheresContactGeometry(),
InteractingBox2InteractingSphere4SpheresContactGeometry()
]),
@@ -43,7 +43,7 @@
## This may consist in deriving contact rigidity from elastic moduli of each body, for example.
## The purpose is that the contact may be "solved" without reference to related bodies,
## only with the information contained in contact geometry and physics.
- InteractionPhysicsMetaEngine([SimpleElasticRelationships()]),
+ InteractionPhysicsDispatcher([SimpleElasticRelationships()]),
## "Solver" of the contact, also called (consitutive) law.
## Based on the information in interaction physics and geometry, it applies corresponding forces on bodies in interaction.
ElasticContactLaw(),
@@ -105,7 +105,7 @@
mass=8*.5*.5*.5*2400
# * se3 (position & orientation) as 3 position coordinates, then 3 direction axis coordinates and rotation angle
b.phys=BodyMacroParameters(se3=[0,0,0,1,0,0,0],mass=mass,inertia=[mass*4*(.5**2+.5**2),mass*4*(.5**2+.5**2),mass*4*(.5**2+.5**2)],young=30e9,poisson=.3)
- # other information about AABB will be updated during simulation by relevant BoundingVolumeMetaEngine
+ # other information about AABB will be updated during simulation by relevant BoundDispatcher
b.bound=AABB(diffuseColor=[0,1,0])
# add the body to the simulation
o.bodies.append(b)
=== modified file 'scripts/test-sphere-facet-corner.py'
--- scripts/test-sphere-facet-corner.py 2009-08-03 17:53:26 +0000
+++ scripts/test-sphere-facet-corner.py 2009-12-04 23:27:26 +0000
@@ -14,16 +14,16 @@
## Initializers
O.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
]
## Engines
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
- InteractionGeometryMetaEngine([InteractingSphere2InteractingSphere4SpheresContactGeometry(),InteractingFacet2InteractingSphere4SpheresContactGeometry()]),
- InteractionPhysicsMetaEngine([MacroMicroElasticRelationships()]),
+ InteractionGeometryDispatcher([InteractingSphere2InteractingSphere4SpheresContactGeometry(),InteractingFacet2InteractingSphere4SpheresContactGeometry()]),
+ InteractionPhysicsDispatcher([MacroMicroElasticRelationships()]),
ElasticContactLaw(),
GravityEngine(gravity=(0,0,-10)),
NewtonsDampedLaw(damping=.3)
=== modified file 'scripts/test-sphere-facet.py'
--- scripts/test-sphere-facet.py 2009-11-17 12:26:35 +0000
+++ scripts/test-sphere-facet.py 2009-12-04 23:27:26 +0000
@@ -18,11 +18,11 @@
#
O.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
]
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[ef2_Facet_Sphere_Dem3DofGeom()],
=== modified file 'scripts/test/Dem3DofGeom.py'
--- scripts/test/Dem3DofGeom.py 2009-11-17 12:26:35 +0000
+++ scripts/test/Dem3DofGeom.py 2009-12-04 23:27:26 +0000
@@ -6,11 +6,11 @@
utils.sphere([-1,0,2],1,dynamic=True,color=(1,0,0),wire=True),
])
O.engines=[
- BoundingVolumeMetaEngine([
+ BoundDispatcher([
InteractingSphere2AABB(),InteractingFacet2AABB(),Wall2AABB()
]),
InsertionSortCollider(),
- InteractionGeometryMetaEngine([
+ InteractionGeometryDispatcher([
ef2_Sphere_Sphere_Dem3DofGeom(),
ef2_Facet_Sphere_Dem3DofGeom(),
ef2_Wall_Sphere_Dem3DofGeom()
=== modified file 'scripts/test/ResetRandomPosition.py'
--- scripts/test/ResetRandomPosition.py 2009-11-19 06:44:50 +0000
+++ scripts/test/ResetRandomPosition.py 2009-12-04 23:27:26 +0000
@@ -38,10 +38,10 @@
s.phys['kn'],s.phys['cn'],s.phys['ks'],s.phys['cs']=p['kn'],p['cn'],p['ks'],p['cs']
# Create engines
-O.initializers=[ BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]) ]
+O.initializers=[ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]) ]
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(), MetaInteractingGeometry2AABB()
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(), MetaInteractingGeometry2AABB()
]),
InsertionSortCollider(nBins=5,sweepLength=.1*Rs),
InteractionDispatchers(
=== modified file 'scripts/test/SpheresFactory/model.py'
--- scripts/test/SpheresFactory/model.py 2009-09-01 12:34:25 +0000
+++ scripts/test/SpheresFactory/model.py 2009-12-04 23:27:26 +0000
@@ -19,16 +19,16 @@
## Initializers
O.initializers=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()])
]
## Engines
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
- InteractionGeometryMetaEngine([ef2_Facet_Sphere_Dem3DofGeom(),ef2_Sphere_Sphere_Dem3DofGeom()]),
- InteractionPhysicsMetaEngine([SimpleElasticRelationships()]),
+ InteractionGeometryDispatcher([ef2_Facet_Sphere_Dem3DofGeom(),ef2_Sphere_Sphere_Dem3DofGeom()]),
+ InteractionPhysicsDispatcher([SimpleElasticRelationships()]),
ConstitutiveLawDispatcher([Law2_Dem3Dof_Elastic_Elastic()]),
GravityEngine(gravity=(0,0,-9.81)),
NewtonsDampedLaw(damping=0.3),
=== modified file 'scripts/test/clump-hopper-viscoelastic.py'
--- scripts/test/clump-hopper-viscoelastic.py 2009-12-02 09:26:16 +0000
+++ scripts/test/clump-hopper-viscoelastic.py 2009-12-04 23:27:26 +0000
@@ -71,7 +71,7 @@
# Create engines
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB()]),
InsertionSortCollider(nBins=5,sweepLength=.1*Rs),
InteractionDispatchers(
[InteractingSphere2InteractingSphere4SpheresContactGeometry(), InteractingFacet2InteractingSphere4SpheresContactGeometry()],
=== modified file 'scripts/test/clump-inbox-viscoelastic.py'
--- scripts/test/clump-inbox-viscoelastic.py 2009-11-26 13:13:21 +0000
+++ scripts/test/clump-inbox-viscoelastic.py 2009-12-04 23:27:26 +0000
@@ -60,7 +60,7 @@
# Create engines
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[InteractingSphere2InteractingSphere4SpheresContactGeometry(), InteractingFacet2InteractingSphere4SpheresContactGeometry()],
=== modified file 'scripts/test/clump-viscoelastic.py'
--- scripts/test/clump-viscoelastic.py 2009-11-26 13:13:21 +0000
+++ scripts/test/clump-viscoelastic.py 2009-12-04 23:27:26 +0000
@@ -40,7 +40,7 @@
# Create engines
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[InteractingSphere2InteractingSphere4SpheresContactGeometry(), InteractingFacet2InteractingSphere4SpheresContactGeometry()],
=== modified file 'scripts/test/clump.py'
--- scripts/test/clump.py 2009-05-05 04:15:26 +0000
+++ scripts/test/clump.py 2009-12-04 23:27:26 +0000
@@ -1,7 +1,7 @@
-O.initializers=[BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])]
+O.initializers=[BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])]
O.engines=[
PhysicalActionContainerReseter(),
- BoundingVolumeMetaEngine([
+ BoundDispatcher([
InteractingSphere2AABB(),
InteractingBox2AABB(),
MetaInteractingGeometry2AABB()
=== modified file 'scripts/test/collider-stride.py'
--- scripts/test/collider-stride.py 2009-08-21 14:14:26 +0000
+++ scripts/test/collider-stride.py 2009-12-04 23:27:26 +0000
@@ -10,7 +10,7 @@
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(label='isc'),
InteractionDispatchers(
[ef2_Facet_Sphere_Dem3DofGeom(),ef2_Sphere_Sphere_Dem3DofGeom()],
@@ -32,6 +32,6 @@
isc['sweepLength']=.1
isc['nBins']=5
#log.setLevel('InsertionSortCollider',log.DEBUG)
-#log.setLevel('BoundingVolumeMetaEngine',log.DEBUG)
+#log.setLevel('BoundDispatcher',log.DEBUG)
O.saveTmp()
O.step()
=== modified file 'scripts/test/collider-sweep-simple.py'
--- scripts/test/collider-sweep-simple.py 2009-07-19 19:24:24 +0000
+++ scripts/test/collider-sweep-simple.py 2009-12-04 23:27:26 +0000
@@ -3,7 +3,7 @@
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(label='collider'),
InteractionDispatchers(
[ef2_Sphere_Sphere_Dem3DofGeom(),ef2_Facet_Sphere_Dem3DofGeom()],
=== modified file 'scripts/test/facet-sphere.py'
--- scripts/test/facet-sphere.py 2009-11-29 11:05:09 +0000
+++ scripts/test/facet-sphere.py 2009-12-04 23:27:26 +0000
@@ -4,7 +4,7 @@
# Test case for sphere-facet interaction.
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB()]),
InsertionSortCollider(),
#SpatialQuickSortCollider(),
InteractionDispatchers(
=== modified file 'scripts/test/gts-horse.py'
--- scripts/test/gts-horse.py 2009-07-19 19:24:24 +0000
+++ scripts/test/gts-horse.py 2009-12-04 23:27:26 +0000
@@ -32,7 +32,7 @@
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(label='collider'),
InteractionDispatchers(
[ef2_Sphere_Sphere_Dem3DofGeom(),ef2_Facet_Sphere_Dem3DofGeom()],
=== modified file 'scripts/test/insertion-sort-collider.py'
--- scripts/test/insertion-sort-collider.py 2009-06-29 07:55:00 +0000
+++ scripts/test/insertion-sort-collider.py 2009-12-04 23:27:26 +0000
@@ -2,7 +2,7 @@
o.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingBox2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
InteractionDispatchers([ef2_Facet_Sphere_Dem3DofGeom()],[SimpleElasticRelationships()],[Law2_Dem3Dof_Elastic_Elastic()],),
GravityEngine(gravity=[0,0,-10]),
=== modified file 'scripts/test/interpolating-force.py'
--- scripts/test/interpolating-force.py 2009-08-03 17:53:26 +0000
+++ scripts/test/interpolating-force.py 2009-12-04 23:27:26 +0000
@@ -16,7 +16,7 @@
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[InteractingSphere2InteractingSphere4SpheresContactGeometry()],
=== modified file 'scripts/test/pack-cloud.py'
--- scripts/test/pack-cloud.py 2009-08-14 05:59:23 +0000
+++ scripts/test/pack-cloud.py 2009-12-04 23:27:26 +0000
@@ -5,6 +5,6 @@
print p.makeCloud(O.periodicCell[0],O.periodicCell[1],.5,.5,1200,True)
for s in p:
O.bodies.append(utils.sphere(s[0],s[1]))
-O.runEngine(BoundingVolumeMetaEngine([InteractingSphere2AABB()]))
+O.runEngine(BoundDispatcher([InteractingSphere2AABB()]))
from yade import qt
qt.View()
=== modified file 'scripts/test/periodic-compress.py'
--- scripts/test/periodic-compress.py 2009-11-25 21:21:17 +0000
+++ scripts/test/periodic-compress.py 2009-12-04 23:27:26 +0000
@@ -9,7 +9,7 @@
O.timingEnabled=True
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[ef2_Sphere_Sphere_Dem3DofGeom()],
=== modified file 'scripts/test/periodic-grow.py'
--- scripts/test/periodic-grow.py 2009-11-25 21:21:17 +0000
+++ scripts/test/periodic-grow.py 2009-12-04 23:27:26 +0000
@@ -5,7 +5,7 @@
log.setLevel("InsertionSortCollider",log.TRACE)
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[ef2_Sphere_Sphere_Dem3DofGeom()],
=== modified file 'scripts/test/periodic-simple.py'
--- scripts/test/periodic-simple.py 2009-12-04 04:53:02 +0000
+++ scripts/test/periodic-simple.py 2009-12-04 23:27:26 +0000
@@ -8,7 +8,7 @@
#log.setLevel("InsertionSortCollider",log.DEBUG)
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(label='collider'),
InteractionDispatchers(
[ef2_Sphere_Sphere_Dem3DofGeom()],
=== modified file 'scripts/test/regular-sphere-pack.py'
--- scripts/test/regular-sphere-pack.py 2009-11-27 14:42:21 +0000
+++ scripts/test/regular-sphere-pack.py 2009-12-04 23:27:26 +0000
@@ -71,7 +71,7 @@
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[ef2_Sphere_Sphere_Dem3DofGeom(),ef2_Facet_Sphere_Dem3DofGeom()],
=== modified file 'scripts/test/remove-body.py'
--- scripts/test/remove-body.py 2009-11-20 09:39:11 +0000
+++ scripts/test/remove-body.py 2009-12-04 23:27:26 +0000
@@ -7,7 +7,7 @@
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),MetaInteractingGeometry2AABB()]),
InsertionSortCollider(nBins=5,sweepLength=5e-3),
#SpatialQuickSortCollider(),
InteractionDispatchers(
=== modified file 'scripts/test/shear.py'
--- scripts/test/shear.py 2009-11-17 12:26:35 +0000
+++ scripts/test/shear.py 2009-12-04 23:27:26 +0000
@@ -8,10 +8,10 @@
utils.sphere([0,0,1],.5000001,dynamic=True,color=(0,0,1))
])
O.engines=[
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB()]),
InsertionSortCollider(),
- InteractionGeometryMetaEngine([InteractingSphere2InteractingSphere4SpheresContactGeometry()]),
- InteractionPhysicsMetaEngine([SimpleElasticRelationships()]),
+ InteractionGeometryDispatcher([InteractingSphere2InteractingSphere4SpheresContactGeometry()]),
+ InteractionPhysicsDispatcher([SimpleElasticRelationships()]),
RotationEngine(rotationAxis=[1,1,0],angularVelocity=.001,subscribedBodies=[1]),
ElasticContactLaw(useShear=False,label='elasticLaw'),
PeriodicPythonRunner(iterPeriod=10000,command='interInfo()'),
=== modified file 'scripts/test/wall.py'
--- scripts/test/wall.py 2009-11-15 15:32:01 +0000
+++ scripts/test/wall.py 2009-12-04 23:27:26 +0000
@@ -22,7 +22,7 @@
O.engines=[
BexResetter(),
- BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingFacet2AABB(),Wall2AABB()]),
+ BoundDispatcher([InteractingSphere2AABB(),InteractingFacet2AABB(),Wall2AABB()]),
InsertionSortCollider(),
InteractionDispatchers(
[ef2_Sphere_Sphere_Dem3DofGeom(),ef2_Facet_Sphere_Dem3DofGeom(),ef2_Wall_Sphere_Dem3DofGeom()],
