yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #02672
[Branch ~yade-dev/yade/trunk] Rev 1893: Hotfix for twice-renamed Bo1_SceneShape_Aabb.
------------------------------------------------------------
revno: 1893
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Fri 2009-12-11 21:01:58 +0100
message:
Hotfix for twice-renamed Bo1_SceneShape_Aabb.
modified:
pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp
pkg/dem/PreProcessor/DirectShearCis.cpp
pkg/dem/PreProcessor/Funnel.cpp
pkg/dem/PreProcessor/HydraulicTest.cpp
pkg/dem/PreProcessor/MembraneTest.cpp
pkg/dem/PreProcessor/ModifiedTriaxialTest.cpp
pkg/dem/PreProcessor/SDECImpactTest.cpp
pkg/dem/PreProcessor/SDECLinkedSpheres.cpp
pkg/dem/PreProcessor/SDECMovingWall.cpp
pkg/dem/PreProcessor/SDECSpheresPlane.cpp
pkg/dem/PreProcessor/STLImporterTest.cpp
pkg/dem/PreProcessor/SimpleScene.cpp
pkg/dem/PreProcessor/SimpleShear.cpp
pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp
pkg/dem/PreProcessor/TetraTestGen.cpp
pkg/dem/PreProcessor/ThreePointBending.cpp
pkg/dem/PreProcessor/TriaxialTest.cpp
pkg/dem/PreProcessor/TriaxialTestWater.cpp
pkg/dem/PreProcessor/UniaxialStrainerGen.cpp
pkg/dem/meta/Shop.cpp
pkg/lattice/PreProcessor/LatticeExample.cpp
pkg/lattice/PreProcessor/LatticeExampleCTData.cpp
pkg/lattice/PreProcessor/LatticeExampleSimple.cpp
pkg/snow/PreProcessor/SnowCreepTest.cpp
pkg/snow/PreProcessor/SnowVoxelsLoader.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/PreProcessor/CohesiveTriaxialTest.cpp'
--- pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp 2009-12-11 20:01:58 +0000
@@ -28,7 +28,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/GravityEngines.hpp>
@@ -403,7 +402,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<NewtonIntegrator> newton(new NewtonIntegrator);
=== modified file 'pkg/dem/PreProcessor/DirectShearCis.cpp'
--- pkg/dem/PreProcessor/DirectShearCis.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/DirectShearCis.cpp 2009-12-11 20:01:58 +0000
@@ -35,7 +35,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/PhysicalActionContainerReseter.hpp>
@@ -289,7 +288,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/Funnel.cpp'
--- pkg/dem/PreProcessor/Funnel.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/Funnel.cpp 2009-12-11 20:01:58 +0000
@@ -24,7 +24,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/PhysicalActionContainerReseter.hpp>
@@ -252,7 +251,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/HydraulicTest.cpp'
--- pkg/dem/PreProcessor/HydraulicTest.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/HydraulicTest.cpp 2009-12-11 20:01:58 +0000
@@ -26,7 +26,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/PhysicalActionDamper.hpp>
=== modified file 'pkg/dem/PreProcessor/MembraneTest.cpp'
--- pkg/dem/PreProcessor/MembraneTest.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/MembraneTest.cpp 2009-12-11 20:01:58 +0000
@@ -32,7 +32,6 @@
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/PhysicalActionContainerReseter.hpp>
@@ -291,7 +290,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("ef2_BssSweptSphereLineSegment_AABB_makeAABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/ModifiedTriaxialTest.cpp'
--- pkg/dem/PreProcessor/ModifiedTriaxialTest.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/ModifiedTriaxialTest.cpp 2009-12-11 20:01:58 +0000
@@ -36,7 +36,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/GravityEngines.hpp>
@@ -497,7 +496,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/SDECImpactTest.cpp'
--- pkg/dem/PreProcessor/SDECImpactTest.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/SDECImpactTest.cpp 2009-12-11 20:01:58 +0000
@@ -28,7 +28,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/GravityEngines.hpp>
@@ -413,7 +412,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
=== modified file 'pkg/dem/PreProcessor/SDECLinkedSpheres.cpp'
--- pkg/dem/PreProcessor/SDECLinkedSpheres.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/SDECLinkedSpheres.cpp 2009-12-11 20:01:58 +0000
@@ -32,7 +32,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/PhysicalActionDamper.hpp>
@@ -287,7 +286,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/SDECMovingWall.cpp'
--- pkg/dem/PreProcessor/SDECMovingWall.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/SDECMovingWall.cpp 2009-12-11 20:01:58 +0000
@@ -25,7 +25,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/PhysicalActionContainerReseter.hpp>
@@ -312,7 +311,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/SDECSpheresPlane.cpp'
--- pkg/dem/PreProcessor/SDECSpheresPlane.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/SDECSpheresPlane.cpp 2009-12-11 20:01:58 +0000
@@ -26,7 +26,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/PhysicalActionContainerReseter.hpp>
@@ -296,7 +295,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/STLImporterTest.cpp'
--- pkg/dem/PreProcessor/STLImporterTest.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/STLImporterTest.cpp 2009-12-11 20:01:58 +0000
@@ -28,7 +28,6 @@
#include<yade/pkg-common/InteractionGeometryDispatcher.hpp>
#include<yade/pkg-common/InteractionPhysicsDispatcher.hpp>
#include<yade/pkg-common/SceneShape.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/PhysicalActionApplier.hpp>
#include<yade/pkg-common/PhysicalActionContainerReseter.hpp>
#include<yade/pkg-common/PhysicalActionDamper.hpp>
@@ -211,7 +210,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingFacet2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/SimpleScene.cpp'
--- pkg/dem/PreProcessor/SimpleScene.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/SimpleScene.cpp 2009-12-11 20:01:58 +0000
@@ -4,7 +4,6 @@
#include<yade/pkg-common/InteractingSphere2AABB.hpp>
#include<yade/pkg-common/InteractingBox2AABB.hpp>
#include<yade/pkg-common/SceneShape.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/PhysicalActionContainerReseter.hpp>
#include<yade/pkg-common/StateMetaEngine.hpp>
#include<yade/pkg-common/AABB.hpp>
@@ -43,7 +42,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add(new InteractingSphere2AABB);
boundDispatcher->add(new InteractingBox2AABB);
- boundDispatcher->add(new Bo1_SceneShape_Aabb);
rootBody->initializers.push_back(boundDispatcher);
//@
/* engines */
=== modified file 'pkg/dem/PreProcessor/SimpleShear.cpp'
--- pkg/dem/PreProcessor/SimpleShear.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/SimpleShear.cpp 2009-12-11 20:01:58 +0000
@@ -34,7 +34,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/PhysicalActionContainerReseter.hpp>
@@ -283,7 +282,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp'
--- pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp 2009-12-11 20:01:58 +0000
@@ -19,7 +19,6 @@
#include<yade/pkg-common/InteractionGeometryDispatcher.hpp>
#include<yade/pkg-common/InteractionPhysicsDispatcher.hpp>
#include<yade/pkg-common/SceneShape.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/InsertionSortCollider.hpp>
#include<yade/pkg-common/PhysicalActionApplier.hpp>
#include<yade/pkg-common/PhysicalActionContainerReseter.hpp>
@@ -147,7 +146,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/TetraTestGen.cpp'
--- pkg/dem/PreProcessor/TetraTestGen.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/TetraTestGen.cpp 2009-12-11 20:01:58 +0000
@@ -6,7 +6,6 @@
#include<yade/pkg-common/InteractionGeometryDispatcher.hpp>
#include<yade/pkg-common/PhysicalActionContainerReseter.hpp>
#include<yade/pkg-common/InsertionSortCollider.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/GravityEngines.hpp>
#include<yade/pkg-dem/NewtonIntegrator.hpp>
@@ -23,7 +22,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add(new TetraAABB);
- boundDispatcher->add(new Bo1_SceneShape_Aabb);
rootBody->initializers.push_back(boundDispatcher);
rootBody->engines.clear();
rootBody->engines.push_back(shared_ptr<Engine>(new BexResetter));
=== modified file 'pkg/dem/PreProcessor/ThreePointBending.cpp'
--- pkg/dem/PreProcessor/ThreePointBending.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/ThreePointBending.cpp 2009-12-11 20:01:58 +0000
@@ -30,7 +30,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/PhysicalActionDamper.hpp>
@@ -273,7 +272,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<CundallNonViscousForceDamping> actionForceDamping(new CundallNonViscousForceDamping);
actionForceDamping->damping = dampingForce;
=== modified file 'pkg/dem/PreProcessor/TriaxialTest.cpp'
--- pkg/dem/PreProcessor/TriaxialTest.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/TriaxialTest.cpp 2009-12-11 20:01:58 +0000
@@ -37,7 +37,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/GravityEngines.hpp>
@@ -505,7 +504,6 @@
boundDispatcher->add("InteractingBox2AABB");
boundDispatcher->add("InteractingFacet2AABB");
boundDispatcher->add("Wall2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/TriaxialTestWater.cpp'
--- pkg/dem/PreProcessor/TriaxialTestWater.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/TriaxialTestWater.cpp 2009-12-11 20:01:58 +0000
@@ -33,7 +33,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/InteractingSphere2AABB.hpp>
@@ -435,7 +434,6 @@
boundDispatcher->add(interactingSphere2AABB);
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GravityEngine> gravityCondition(new GravityEngine);
gravityCondition->gravity = gravity;
=== modified file 'pkg/dem/PreProcessor/UniaxialStrainerGen.cpp'
--- pkg/dem/PreProcessor/UniaxialStrainerGen.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/PreProcessor/UniaxialStrainerGen.cpp 2009-12-11 20:01:58 +0000
@@ -11,7 +11,6 @@
#include<yade/pkg-common/AABB.hpp>
#include<yade/pkg-common/InteractingSphere2AABB.hpp>
#include<yade/pkg-common/SceneShape.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/InteractionGeometryDispatcher.hpp>
#include<yade/pkg-common/InteractionPhysicsDispatcher.hpp>
#include<yade/pkg-common/PhysicalActionApplier.hpp>
@@ -86,7 +85,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add(new InteractingSphere2AABB);
- boundDispatcher->add(new Bo1_SceneShape_Aabb);
rootBody->initializers.push_back(boundDispatcher);
rootBody->engines.clear();
=== modified file 'pkg/dem/meta/Shop.cpp'
--- pkg/dem/meta/Shop.cpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/meta/Shop.cpp 2009-12-11 20:01:58 +0000
@@ -10,7 +10,6 @@
#include<yade/core/Scene.hpp>
#include<yade/core/Body.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/AABB.hpp>
#include<yade/pkg-common/InsertionSortCollider.hpp>
@@ -27,7 +26,6 @@
#include<yade/pkg-common/InteractingSphere2AABB.hpp>
#include<yade/pkg-common/InteractingBox2AABB.hpp>
#include<yade/pkg-common/SceneShape.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-dem/NewtonIntegrator.hpp>
#include<yade/pkg-dem/InteractingSphere2InteractingSphere4SpheresContactGeometry.hpp>
#include<yade/pkg-dem/InteractingBox2InteractingSphere4SpheresContactGeometry.hpp>
@@ -36,8 +34,7 @@
#include<yade/pkg-dem/ViscoelasticPM.hpp>
/*class InteractingSphere2AABB;
class InteractingBox2AABB;
-class SceneShape;
-class Bo1_SceneShape_Aabb; */
+class SceneShape; */
#include<yade/pkg-common/PhysicalActionContainerReseter.hpp>
=== modified file 'pkg/lattice/PreProcessor/LatticeExample.cpp'
--- pkg/lattice/PreProcessor/LatticeExample.cpp 2009-12-11 18:10:19 +0000
+++ pkg/lattice/PreProcessor/LatticeExample.cpp 2009-12-11 20:01:58 +0000
@@ -978,7 +978,6 @@
void LatticeExample::createActors(shared_ptr<Scene>& )
{
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GeometricalModelMetaEngine> geometricalModelDispatcher = shared_ptr<GeometricalModelMetaEngine>(new GeometricalModelMetaEngine);
geometricalModelDispatcher->add("LatticeSet2LatticeBeams");
=== modified file 'pkg/lattice/PreProcessor/LatticeExampleCTData.cpp'
--- pkg/lattice/PreProcessor/LatticeExampleCTData.cpp 2009-12-11 18:10:19 +0000
+++ pkg/lattice/PreProcessor/LatticeExampleCTData.cpp 2009-12-11 20:01:58 +0000
@@ -464,7 +464,6 @@
void LatticeExampleCTData::make_simulation_loop(shared_ptr<Scene>& )
{
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GeometricalModelMetaEngine> geometricalModelDispatcher = shared_ptr<GeometricalModelMetaEngine>(new GeometricalModelMetaEngine);
geometricalModelDispatcher->add("LatticeSet2LatticeBeams");
=== modified file 'pkg/lattice/PreProcessor/LatticeExampleSimple.cpp'
--- pkg/lattice/PreProcessor/LatticeExampleSimple.cpp 2009-12-11 18:10:19 +0000
+++ pkg/lattice/PreProcessor/LatticeExampleSimple.cpp 2009-12-11 20:01:58 +0000
@@ -421,7 +421,6 @@
void LatticeExampleSimple::make_simulation_loop(shared_ptr<Scene>& )
{
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
- boundDispatcher->add("Bo1_SceneShape_Aabb");
shared_ptr<GeometricalModelMetaEngine> geometricalModelDispatcher = shared_ptr<GeometricalModelMetaEngine>(new GeometricalModelMetaEngine);
geometricalModelDispatcher->add("LatticeSet2LatticeBeams");
=== modified file 'pkg/snow/PreProcessor/SnowCreepTest.cpp'
--- pkg/snow/PreProcessor/SnowCreepTest.cpp 2009-12-11 18:10:19 +0000
+++ pkg/snow/PreProcessor/SnowCreepTest.cpp 2009-12-11 20:01:58 +0000
@@ -34,7 +34,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/GravityEngines.hpp>
@@ -504,7 +503,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("InteractingSphere2AABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
=== modified file 'pkg/snow/PreProcessor/SnowVoxelsLoader.cpp'
--- pkg/snow/PreProcessor/SnowVoxelsLoader.cpp 2009-12-11 18:10:19 +0000
+++ pkg/snow/PreProcessor/SnowVoxelsLoader.cpp 2009-12-11 20:01:58 +0000
@@ -27,7 +27,6 @@
#include<yade/lib-serialization/IOFormatManager.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/BoundDispatcher.hpp>
-#include<yade/pkg-common/Bo1_SceneShape_Aabb.hpp>
#include<yade/pkg-common/SceneShape.hpp>
#include<yade/pkg-common/GravityEngines.hpp>
@@ -383,7 +382,6 @@
shared_ptr<BoundDispatcher> boundDispatcher = shared_ptr<BoundDispatcher>(new BoundDispatcher);
boundDispatcher->add("Ef2_BssSnowGrain_AABB_makeAABB");
boundDispatcher->add("InteractingBox2AABB");
- boundDispatcher->add("Bo1_SceneShape_Aabb");
