yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #02241
[Branch ~yade-dev/yade/trunk] Rev 1793: 1. Flatten file hierarchy a little bit.
------------------------------------------------------------
revno: 1793
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Wed 2009-11-18 14:34:36 +0100
message:
1. Flatten file hierarchy a little bit.
2. Add MetaEngine{1,2}D and EngineUnit{1,2}D to the MetaEngine.hpp and EngineUnit.hpp instead of having them in separate headers.
removed:
core/EngineUnit1D.hpp
core/EngineUnit2D.hpp
core/MetaEngine1D.hpp
core/MetaEngine2D.hpp
pkg/common/DataClass/BoundingVolume/BoundingSphere.cpp
pkg/common/DataClass/BoundingVolume/BoundingSphere.hpp
pkg/common/DataClass/InteractionGeometry/
pkg/common/DataClass/Widgets/
pkg/common/Engine/FilterEngine/
pkg/common/RenderingEngine/GLDrawBoundingVolume/
pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.cpp
pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.hpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/
pkg/common/RenderingEngine/GLDrawInteractingGeometry/
pkg/common/RenderingEngine/GLDrawInteractionGeometry/
pkg/common/RenderingEngine/GLDrawInteractionPhysics/
pkg/common/RenderingEngine/GLDrawShadowVolume/
pkg/common/RenderingEngine/GLDrawState/
pkg/common/RenderingEngine/GLDrawWidgets/
pkg/common/RenderingEngine/OpenGLRenderingEngine/
pkg/dem/DataClass/InteractingGeometry/
pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/
pkg/dem/RenderingEngine/GLDrawElasticContactInteraction/
pkg/dem/RenderingEngine/GLDrawInteractingMyTetrahedron/
pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/
pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/
pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/
pkg/lattice/RenderingEngine/GLDrawLatticeBeamState/
pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry/
pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry/
pkg/lattice/RenderingEngine/GLDrawLineSegment/
renamed:
pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawAABB.cpp => pkg/common/RenderingEngine/GLDrawAABB.cpp
pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawAABB.hpp => pkg/common/RenderingEngine/GLDrawAABB.hpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawBox.cpp => pkg/common/RenderingEngine/GLDrawBox.cpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawBox.hpp => pkg/common/RenderingEngine/GLDrawBox.hpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawFacet.cpp => pkg/common/RenderingEngine/GLDrawFacet.cpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawFacet.hpp => pkg/common/RenderingEngine/GLDrawFacet.hpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawQuadrilateral.cpp => pkg/common/RenderingEngine/GLDrawQuadrilateral.cpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawQuadrilateral.hpp => pkg/common/RenderingEngine/GLDrawQuadrilateral.hpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.cpp => pkg/common/RenderingEngine/GLDrawSphere.cpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.hpp => pkg/common/RenderingEngine/GLDrawSphere.hpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTetrahedron.cpp => pkg/common/RenderingEngine/GLDrawTetrahedron.cpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTetrahedron.hpp => pkg/common/RenderingEngine/GLDrawTetrahedron.hpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTube.cpp => pkg/common/RenderingEngine/GLDrawTube.cpp
pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTube.hpp => pkg/common/RenderingEngine/GLDrawTube.hpp
pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawBssSweptSphereLineSegment.cpp => pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.cpp
pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawBssSweptSphereLineSegment.hpp => pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.hpp
pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingBox.cpp => pkg/common/RenderingEngine/GLDrawInteractingBox.cpp
pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingBox.hpp => pkg/common/RenderingEngine/GLDrawInteractingBox.hpp
pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingFacet.cpp => pkg/common/RenderingEngine/GLDrawInteractingFacet.cpp
pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingFacet.hpp => pkg/common/RenderingEngine/GLDrawInteractingFacet.hpp
pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.cpp => pkg/common/RenderingEngine/GLDrawInteractingSphere.cpp
pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.hpp => pkg/common/RenderingEngine/GLDrawInteractingSphere.hpp
pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawMetaInteractingGeometry.cpp => pkg/common/RenderingEngine/GLDrawMetaInteractingGeometry.cpp
pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawMetaInteractingGeometry.hpp => pkg/common/RenderingEngine/GLDrawMetaInteractingGeometry.hpp
pkg/common/RenderingEngine/GLDrawInteractionPhysics/GLDrawNormalInteraction.cpp => pkg/common/RenderingEngine/GLDrawNormalInteraction.cpp
pkg/common/RenderingEngine/GLDrawInteractionPhysics/GLDrawNormalInteraction.hpp => pkg/common/RenderingEngine/GLDrawNormalInteraction.hpp
pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawBoxShadowVolume.cpp => pkg/common/RenderingEngine/GLDrawBoxShadowVolume.cpp
pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawBoxShadowVolume.hpp => pkg/common/RenderingEngine/GLDrawBoxShadowVolume.hpp
pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawSphereShadowVolume.cpp => pkg/common/RenderingEngine/GLDrawSphereShadowVolume.cpp
pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawSphereShadowVolume.hpp => pkg/common/RenderingEngine/GLDrawSphereShadowVolume.hpp
pkg/common/RenderingEngine/GLDrawState/GLDrawParticleState.cpp => pkg/common/RenderingEngine/GLDrawParticleState.cpp
pkg/common/RenderingEngine/GLDrawState/GLDrawParticleState.hpp => pkg/common/RenderingEngine/GLDrawParticleState.hpp
pkg/common/RenderingEngine/GLDrawState/GLDrawRigidBodyState.cpp => pkg/common/RenderingEngine/GLDrawRigidBodyState.cpp
pkg/common/RenderingEngine/GLDrawState/GLDrawRigidBodyState.hpp => pkg/common/RenderingEngine/GLDrawRigidBodyState.hpp
pkg/common/RenderingEngine/OpenGLRenderingEngine/GLDrawFunctors.hpp => pkg/common/RenderingEngine/GLDrawFunctors.hpp
pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.cpp => pkg/common/RenderingEngine/OpenGLRenderingEngine.cpp
pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.hpp => pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp
pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.cpp => pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp
pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.hpp => pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp
pkg/dem/RenderingEngine/GLDrawElasticContactInteraction/GLDrawElasticContactInteraction.cpp => pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.cpp
pkg/dem/RenderingEngine/GLDrawElasticContactInteraction/GLDrawElasticContactInteraction.hpp => pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.hpp
pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.cpp => pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.cpp
pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.hpp => pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.hpp
pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.cpp => pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.cpp
pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.hpp => pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.hpp
pkg/lattice/RenderingEngine/GLDrawLatticeBeamState/GLDrawLatticeBeamState.cpp => pkg/lattice/RenderingEngine/GLDrawLatticeBeamState.cpp
pkg/lattice/RenderingEngine/GLDrawLatticeBeamState/GLDrawLatticeBeamState.hpp => pkg/lattice/RenderingEngine/GLDrawLatticeBeamState.hpp
pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry/GLDrawLatticeInteractingGeometry.cpp => pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry.cpp
pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry/GLDrawLatticeInteractingGeometry.hpp => pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry.hpp
pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry/GLDrawLatticeSetGeometry.cpp => pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry.cpp
pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry/GLDrawLatticeSetGeometry.hpp => pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry.hpp
pkg/lattice/RenderingEngine/GLDrawLineSegment/GLDrawLineSegment.cpp => pkg/lattice/RenderingEngine/GLDrawLineSegment.cpp
pkg/lattice/RenderingEngine/GLDrawLineSegment/GLDrawLineSegment.hpp => pkg/lattice/RenderingEngine/GLDrawLineSegment.hpp
modified:
core/EngineUnit.hpp
core/MetaEngine.hpp
pkg/common/Engine/MetaEngine/BoundingVolumeEngineUnit.hpp
pkg/common/Engine/MetaEngine/BoundingVolumeMetaEngine.hpp
pkg/common/Engine/MetaEngine/ConstitutiveLaw.hpp
pkg/common/Engine/MetaEngine/ConstitutiveLawDispatcher.hpp
pkg/common/Engine/MetaEngine/GeometricalModelEngineUnit.hpp
pkg/common/Engine/MetaEngine/GeometricalModelMetaEngine.hpp
pkg/common/Engine/MetaEngine/InteractingGeometryEngineUnit.hpp
pkg/common/Engine/MetaEngine/InteractingGeometryMetaEngine.hpp
pkg/common/Engine/MetaEngine/InteractionGeometryEngineUnit.hpp
pkg/common/Engine/MetaEngine/InteractionGeometryMetaEngine.hpp
pkg/common/Engine/MetaEngine/InteractionPhysicsEngineUnit.hpp
pkg/common/Engine/MetaEngine/InteractionPhysicsMetaEngine.hpp
pkg/common/Engine/MetaEngine/PhysicalActionApplier.hpp
pkg/common/Engine/MetaEngine/PhysicalActionApplierUnit.hpp
pkg/common/Engine/MetaEngine/PhysicalActionDamper.hpp
pkg/common/Engine/MetaEngine/PhysicalActionDamperUnit.hpp
pkg/common/Engine/MetaEngine/PhysicalParametersEngineUnit.hpp
pkg/common/Engine/MetaEngine/PhysicalParametersMetaEngine.hpp
pkg/dem/DataClass/InteractionPhysics/CapillaryParameters.cpp*
pkg/dem/DataClass/InteractionPhysics/CapillaryParameters.hpp*
pkg/dem/Engine/DeusExMachina/CapillaryPressureEngine.hpp*
pkg/dem/Engine/DeusExMachina/CapillaryRecorder.hpp*
pkg/dem/Engine/DeusExMachina/CapillaryStressRecorder.hpp*
pkg/dem/Engine/DeusExMachina/ContactStressRecorder.hpp*
pkg/dem/Engine/DeusExMachina/SampleCapillaryPressureEngine.cpp*
pkg/dem/Engine/DeusExMachina/SampleCapillaryPressureEngine.hpp*
pkg/dem/Engine/DeusExMachina/WallStressRecorder.hpp*
pkg/dem/Engine/EngineUnit/SimpleElasticRelationshipsWater.hpp*
pkg/dem/Engine/StandAloneEngine/CapillaryCohesiveLaw.cpp*
pkg/dem/Engine/StandAloneEngine/CapillaryCohesiveLaw.hpp*
pkg/dem/Engine/StandAloneEngine/MicroMacroAnalyser.hpp*
pkg/dem/Engine/StandAloneEngine/ViscousForceDamping.cpp*
pkg/dem/Engine/StandAloneEngine/ViscousForceDamping.hpp*
pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.hpp*
pkg/dem/PreProcessor/TriaxialTestWater.cpp*
pkg/dem/PreProcessor/TriaxialTestWater.hpp*
py/yadeWrapper/yadeWrapper.cpp
pkg/common/RenderingEngine/GLDrawFunctors.hpp
pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp
--
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 'core/EngineUnit.hpp'
--- core/EngineUnit.hpp 2009-08-03 10:02:11 +0000
+++ core/EngineUnit.hpp 2009-11-18 13:34:36 +0000
@@ -11,6 +11,7 @@
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
+#include<yade/lib-multimethods/FunctorWrapper.hpp>
class TimingDeltas;
@@ -24,7 +25,43 @@
REGISTER_CLASS_AND_BASE(EngineUnit,Serializable);
REGISTER_ATTRIBUTES(Serializable,(label));
};
-
REGISTER_SERIALIZABLE(EngineUnit);
+
+template
+<
+ class ReturnType,
+ class AttributesType
+>
+class EngineUnit1D : public EngineUnit,
+ public FunctorWrapper<ReturnType, AttributesType>
+{
+ public:
+ #define FUNCTOR1D(type1) public: std::string get1DFunctorType1(void){return string(#type1);}
+ virtual std::string get1DFunctorType1(void){throw runtime_error("Class "+this->getClassName()+" did not use FUNCTOR1D to declare its argument type?"); }
+ virtual vector<string> getFunctorTypes(void){vector<string> ret; ret.push_back(get1DFunctorType1()); return ret;};
+ REGISTER_CLASS_AND_BASE(EngineUnit1D,EngineUnit FunctorWrapper);
+ /* do not REGISTER_ATTRIBUTES here, since we are template; derived classes should call REGISTER_ATTRIBUTES(EngineUnit,(their)(own)(attributes)), bypassing EngineUnit1D */
+};
+
+
+template
+<
+ class ReturnType,
+ class AttributesType
+>
+class EngineUnit2D : public EngineUnit,
+ public FunctorWrapper<ReturnType, AttributesType>
+{
+ public:
+ #define FUNCTOR2D(type1,type2) public: std::string get2DFunctorType1(void){return string(#type1);}; std::string get2DFunctorType2(void){return string(#type2);};
+ virtual std::string get2DFunctorType1(void){throw runtime_error("Class "+this->getClassName()+" did not use FUNCTOR2D to declare its argument types?");}
+ virtual std::string get2DFunctorType2(void){throw runtime_error("Class "+this->getClassName()+" did not use FUNCTOR2D to declare its argument types?");}
+ virtual vector<string> getFunctorTypes(){vector<string> ret; ret.push_back(get2DFunctorType1()); ret.push_back(get2DFunctorType2()); return ret;};
+ REGISTER_CLASS_AND_BASE(EngineUnit2D,EngineUnit FunctorWrapper);
+ /* do not REGISTER_ATTRIBUTES here, since we are template; derived classes should call REGISTER_ATTRIBUTES(EngineUnit,(their)(own)(attributes)), bypassing EngineUnit2D */
+};
+
+
+
=== removed file 'core/EngineUnit1D.hpp'
--- core/EngineUnit1D.hpp 2009-05-01 14:47:26 +0000
+++ core/EngineUnit1D.hpp 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2004 by Olivier Galizzi *
-* olivier.galizzi@xxxxxxx *
-* *
-* This program is free software; it is licensed under the terms of the *
-* GNU General Public License v2 or later. See file LICENSE for details. *
-*************************************************************************/
-
-#pragma once
-
-#include "EngineUnit.hpp"
-
-#include<yade/lib-multimethods/FunctorWrapper.hpp>
-
-#define FUNCTOR1D(type1) public: std::string get1DFunctorType1(void){return string(#type1);}
-
-template
-<
- class ReturnType,
- class AttributesType
->
-class EngineUnit1D : public EngineUnit,
- public FunctorWrapper<ReturnType, AttributesType>
-{
- public:
- virtual std::string get1DFunctorType1(void){throw runtime_error("Class "+this->getClassName()+" did not use FUNCTOR1D to declare its argument type?"); }
- virtual vector<string> getFunctorTypes(void){vector<string> ret; ret.push_back(get1DFunctorType1()); return ret;};
- REGISTER_CLASS_AND_BASE(EngineUnit1D,EngineUnit FunctorWrapper);
- /* do not REGISTER_ATTRIBUTES here, since we are template; derived classes should call REGISTER_ATTRIBUTES(EngineUnit,(their)(own)(attributes)), bypassing EngineUnit1D */
-};
-
-
=== removed file 'core/EngineUnit2D.hpp'
--- core/EngineUnit2D.hpp 2009-05-01 14:47:26 +0000
+++ core/EngineUnit2D.hpp 1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2004 by Olivier Galizzi *
-* olivier.galizzi@xxxxxxx *
-* *
-* This program is free software; it is licensed under the terms of the *
-* GNU General Public License v2 or later. See file LICENSE for details. *
-*************************************************************************/
-
-#pragma once
-
-#include "EngineUnit.hpp"
-
-#include<yade/lib-multimethods/FunctorWrapper.hpp>
-
-#define FUNCTOR2D(type1,type2) public: std::string get2DFunctorType1(void){return string(#type1);}; std::string get2DFunctorType2(void){return string(#type2);};
-
-
-template
-<
- class ReturnType,
- class AttributesType
->
-class EngineUnit2D : public EngineUnit,
- public FunctorWrapper<ReturnType, AttributesType>
-{
- public:
- virtual std::string get2DFunctorType1(void){throw runtime_error("Class "+this->getClassName()+" did not use FUNCTOR2D to declare its argument types?");}
- virtual std::string get2DFunctorType2(void){throw runtime_error("Class "+this->getClassName()+" did not use FUNCTOR2D to declare its argument types?");}
- virtual vector<string> getFunctorTypes(){vector<string> ret; ret.push_back(get2DFunctorType1()); ret.push_back(get2DFunctorType2()); return ret;};
- REGISTER_CLASS_AND_BASE(EngineUnit2D,EngineUnit FunctorWrapper);
- /* do not REGISTER_ATTRIBUTES here, since we are template; derived classes should call REGISTER_ATTRIBUTES(EngineUnit,(their)(own)(attributes)), bypassing EngineUnit2D */
-};
-
-
=== modified file 'core/MetaEngine.hpp'
--- core/MetaEngine.hpp 2009-01-27 02:19:40 +0000
+++ core/MetaEngine.hpp 2009-11-18 13:34:36 +0000
@@ -10,6 +10,7 @@
#include "Engine.hpp"
#include "EngineUnit.hpp"
+#include<yade/lib-multimethods/DynLibDispatcher.hpp>
class MetaEngine : public Engine
{
@@ -50,7 +51,149 @@
REGISTER_ATTRIBUTES(Engine,(functorNames)(functorArguments));
REGISTER_CLASS_AND_BASE(MetaEngine,Engine);
};
-
REGISTER_SERIALIZABLE(MetaEngine);
+
+template
+<
+ class baseClass,
+ class EngineUnitType,
+ class EngineUnitReturnType,
+ class EngineUnitArguments,
+ bool autoSymmetry=true
+>
+class MetaEngine1D : public MetaEngine,
+ public DynLibDispatcher
+ < TYPELIST_1(baseClass) // base classes for dispatch
+ , EngineUnitType // class that provides multivirtual call
+ , EngineUnitReturnType // return type
+ , EngineUnitArguments
+ , autoSymmetry
+ >
+{
+
+ public :
+ void dump(){ DynLibDispatcher<TYPELIST_1(baseClass),EngineUnitType,EngineUnitReturnType,EngineUnitArguments,autoSymmetry>::dumpDispatchMatrix1D(std::cerr); }
+ virtual void add(EngineUnitType* eu){ add(shared_ptr<EngineUnitType>(eu)); }
+ virtual void add(shared_ptr<EngineUnitType> eu){
+ storeFunctorName(eu->get1DFunctorType1(),eu->getClassName(),eu);
+ add1DEntry(eu->get1DFunctorType1(),eu->getClassName(),static_pointer_cast<EngineUnitType>(eu));
+ }
+
+ virtual void add(string euType){
+ shared_ptr<EngineUnitType> eu=dynamic_pointer_cast<EngineUnitType>(ClassFactory::instance().createShared(euType));
+ // if(!eu) throw runtime_error("Class `"+euType+"' could not be cast to required 1D EngineUnit");
+ if(!eu){
+ cerr<<__FILE__<<":"<<__LINE__<<" WARNING! dynamic cast of engine unit "<<euType<<" failed, will use static_cast. Go figure why."<<endl;
+ eu=static_pointer_cast<EngineUnitType>(ClassFactory::instance().createShared(euType));
+ }
+ add(eu);
+ }
+
+ int getDimension() { return 1; }
+
+ virtual string getEngineUnitType()
+ {
+ shared_ptr<EngineUnitType> eu(new EngineUnitType);
+ return eu->getClassName();
+ }
+
+ virtual string getBaseClassType(unsigned int i)
+ {
+ if (i==0)
+ {
+ shared_ptr<baseClass> bc(new baseClass);
+ return bc->getClassName();
+ }
+ else
+ return "";
+ }
+
+ protected :
+ void postProcessAttributes(bool deserializing)
+ {
+ MetaEngine::postProcessAttributes(deserializing);
+ if(deserializing)
+ {
+ for(unsigned int i=0;i<functorNames.size();i++)
+ add1DEntry(functorNames[i][0],functorNames[i][1],static_pointer_cast<EngineUnitType>(findFunctorArguments(functorNames[i][1])));
+ }
+ }
+ REGISTER_ATTRIBUTES(MetaEngine,);
+ REGISTER_CLASS_AND_BASE(MetaEngine1D,MetaEngine DynLibDispatcher);
+};
+
+
+template
+<
+ class baseClass1,
+ class baseClass2,
+ class EngineUnitType,
+ class EngineUnitReturnType,
+ class EngineUnitArguments,
+ bool autoSymmetry=true
+>
+class MetaEngine2D : public MetaEngine,
+ public DynLibDispatcher
+ < TYPELIST_2(baseClass1,baseClass2) // base classes for dispatch
+ , EngineUnitType // class that provides multivirtual call
+ , EngineUnitReturnType // return type
+ , EngineUnitArguments // argument of engine unit
+ , autoSymmetry
+ >
+{
+ public :
+ void dump(){ DynLibDispatcher<TYPELIST_2(baseClass1,baseClass2),EngineUnitType,EngineUnitReturnType,EngineUnitArguments,autoSymmetry>::dumpDispatchMatrix2D(std::cerr); }
+ /* add functor by pointer: this is convenience for calls like foo->add(new SomeFunctor); */
+ virtual void add(EngineUnitType* eu){ add(shared_ptr<EngineUnitType>(eu)); }
+ /* add functor by shared pointer */
+ virtual void add(shared_ptr<EngineUnitType> eu){
+ storeFunctorName(eu->get2DFunctorType1(),eu->get2DFunctorType2(),eu->getClassName(),eu);
+ add2DEntry(eu->get2DFunctorType1(),eu->get2DFunctorType2(),eu->getClassName(),static_pointer_cast<EngineUnitType>(eu));
+ }
+ /* add functor by its literal name */
+ virtual void add(string euType){
+ shared_ptr<EngineUnitType> eu=static_pointer_cast<EngineUnitType>(ClassFactory::instance().createShared(euType));
+ add(eu);
+ }
+
+
+ virtual int getDimension() { return 2; }
+
+ virtual string getEngineUnitType()
+ {
+ shared_ptr<EngineUnitType> eu(new EngineUnitType);
+ return eu->getClassName();
+ }
+
+ virtual string getBaseClassType(unsigned int i)
+ {
+ if (i==0)
+ {
+ shared_ptr<baseClass1> bc(new baseClass1);
+ return bc->getClassName();
+ }
+ else if (i==1)
+ {
+ shared_ptr<baseClass2> bc(new baseClass2);
+ return bc->getClassName();
+ }
+ else
+ return "";
+ }
+
+ protected :
+ void postProcessAttributes(bool deserializing)
+ {
+ MetaEngine::postProcessAttributes(deserializing);
+ if(deserializing)
+ {
+ for(unsigned int i=0;i<functorNames.size();i++)
+ add2DEntry(functorNames[i][0],functorNames[i][1],functorNames[i][2],static_pointer_cast<EngineUnitType>(findFunctorArguments(functorNames[i][2])));
+ }
+ }
+ REGISTER_ATTRIBUTES(MetaEngine,);
+ REGISTER_CLASS_AND_BASE(MetaEngine2D,MetaEngine DynLibDispatcher);
+};
+
=== removed file 'core/MetaEngine1D.hpp'
--- core/MetaEngine1D.hpp 2009-08-21 10:06:00 +0000
+++ core/MetaEngine1D.hpp 1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2004 by Olivier Galizzi *
-* olivier.galizzi@xxxxxxx *
-* *
-* This program is free software; it is licensed under the terms of the *
-* GNU General Public License v2 or later. See file LICENSE for details. *
-*************************************************************************/
-
-#pragma once
-
-#include "MetaEngine.hpp"
-#include<yade/lib-multimethods/DynLibDispatcher.hpp>
-
-template
-<
- class baseClass,
- class EngineUnitType,
- class EngineUnitReturnType,
- class EngineUnitArguments,
- bool autoSymmetry=true
->
-class MetaEngine1D : public MetaEngine,
- public DynLibDispatcher
- < TYPELIST_1(baseClass) // base classes for dispatch
- , EngineUnitType // class that provides multivirtual call
- , EngineUnitReturnType // return type
- , EngineUnitArguments
- , autoSymmetry
- >
-{
-
- public :
- void dump(){ DynLibDispatcher<TYPELIST_1(baseClass),EngineUnitType,EngineUnitReturnType,EngineUnitArguments,autoSymmetry>::dumpDispatchMatrix1D(std::cerr); }
- virtual void add(EngineUnitType* eu){ add(shared_ptr<EngineUnitType>(eu)); }
- virtual void add(shared_ptr<EngineUnitType> eu){
- storeFunctorName(eu->get1DFunctorType1(),eu->getClassName(),eu);
- add1DEntry(eu->get1DFunctorType1(),eu->getClassName(),static_pointer_cast<EngineUnitType>(eu));
- }
-
- virtual void add(string euType){
- shared_ptr<EngineUnitType> eu=dynamic_pointer_cast<EngineUnitType>(ClassFactory::instance().createShared(euType));
- // if(!eu) throw runtime_error("Class `"+euType+"' could not be cast to required 1D EngineUnit");
- if(!eu){
- cerr<<__FILE__<<":"<<__LINE__<<" WARNING! dynamic cast of engine unit "<<euType<<" failed, will use static_cast. Go figure why."<<endl;
- eu=static_pointer_cast<EngineUnitType>(ClassFactory::instance().createShared(euType));
- }
- add(eu);
- }
-
- int getDimension() { return 1; }
-
- virtual string getEngineUnitType()
- {
- shared_ptr<EngineUnitType> eu(new EngineUnitType);
- return eu->getClassName();
- }
-
- virtual string getBaseClassType(unsigned int i)
- {
- if (i==0)
- {
- shared_ptr<baseClass> bc(new baseClass);
- return bc->getClassName();
- }
- else
- return "";
- }
-
- protected :
- void postProcessAttributes(bool deserializing)
- {
- MetaEngine::postProcessAttributes(deserializing);
- if(deserializing)
- {
- for(unsigned int i=0;i<functorNames.size();i++)
- add1DEntry(functorNames[i][0],functorNames[i][1],static_pointer_cast<EngineUnitType>(findFunctorArguments(functorNames[i][1])));
- }
- }
- REGISTER_ATTRIBUTES(MetaEngine,);
- REGISTER_CLASS_AND_BASE(MetaEngine1D,MetaEngine DynLibDispatcher);
-};
-
-
=== removed file 'core/MetaEngine2D.hpp'
--- core/MetaEngine2D.hpp 2009-08-21 10:06:00 +0000
+++ core/MetaEngine2D.hpp 1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2004 by Olivier Galizzi *
-* olivier.galizzi@xxxxxxx *
-* *
-* This program is free software; it is licensed under the terms of the *
-* GNU General Public License v2 or later. See file LICENSE for details. *
-*************************************************************************/
-
-#pragma once
-
-#include "MetaEngine.hpp"
-#include<yade/lib-multimethods/DynLibDispatcher.hpp>
-
-
-template
-<
- class baseClass1,
- class baseClass2,
- class EngineUnitType,
- class EngineUnitReturnType,
- class EngineUnitArguments,
- bool autoSymmetry=true
->
-class MetaEngine2D : public MetaEngine,
- public DynLibDispatcher
- < TYPELIST_2(baseClass1,baseClass2) // base classes for dispatch
- , EngineUnitType // class that provides multivirtual call
- , EngineUnitReturnType // return type
- , EngineUnitArguments // argument of engine unit
- , autoSymmetry
- >
-{
- public :
- void dump(){ DynLibDispatcher<TYPELIST_2(baseClass1,baseClass2),EngineUnitType,EngineUnitReturnType,EngineUnitArguments,autoSymmetry>::dumpDispatchMatrix2D(std::cerr); }
- /* add functor by pointer: this is convenience for calls like foo->add(new SomeFunctor); */
- virtual void add(EngineUnitType* eu){ add(shared_ptr<EngineUnitType>(eu)); }
- /* add functor by shared pointer */
- virtual void add(shared_ptr<EngineUnitType> eu){
- storeFunctorName(eu->get2DFunctorType1(),eu->get2DFunctorType2(),eu->getClassName(),eu);
- add2DEntry(eu->get2DFunctorType1(),eu->get2DFunctorType2(),eu->getClassName(),static_pointer_cast<EngineUnitType>(eu));
- }
- /* add functor by its literal name */
- virtual void add(string euType){
- shared_ptr<EngineUnitType> eu=static_pointer_cast<EngineUnitType>(ClassFactory::instance().createShared(euType));
- add(eu);
- }
-
-
- virtual int getDimension() { return 2; }
-
- virtual string getEngineUnitType()
- {
- shared_ptr<EngineUnitType> eu(new EngineUnitType);
- return eu->getClassName();
- }
-
- virtual string getBaseClassType(unsigned int i)
- {
- if (i==0)
- {
- shared_ptr<baseClass1> bc(new baseClass1);
- return bc->getClassName();
- }
- else if (i==1)
- {
- shared_ptr<baseClass2> bc(new baseClass2);
- return bc->getClassName();
- }
- else
- return "";
- }
-
- protected :
- void postProcessAttributes(bool deserializing)
- {
- MetaEngine::postProcessAttributes(deserializing);
- if(deserializing)
- {
- for(unsigned int i=0;i<functorNames.size();i++)
- add2DEntry(functorNames[i][0],functorNames[i][1],functorNames[i][2],static_pointer_cast<EngineUnitType>(findFunctorArguments(functorNames[i][2])));
- }
- }
- REGISTER_ATTRIBUTES(MetaEngine,);
- REGISTER_CLASS_AND_BASE(MetaEngine2D,MetaEngine DynLibDispatcher);
-
-};
-
=== removed file 'pkg/common/DataClass/BoundingVolume/BoundingSphere.cpp'
--- pkg/common/DataClass/BoundingVolume/BoundingSphere.cpp 2009-08-03 10:02:11 +0000
+++ pkg/common/DataClass/BoundingVolume/BoundingSphere.cpp 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2004 by Olivier Galizzi *
-* olivier.galizzi@xxxxxxx *
-* *
-* This program is free software; it is licensed under the terms of the *
-* GNU General Public License v2 or later. See file LICENSE for details. *
-*************************************************************************/
-
-#include "BoundingSphere.hpp"
-
-BoundingSphere::BoundingSphere () : BoundingVolume()
-{
- createIndex();
-}
-
-BoundingSphere::~BoundingSphere ()
-{
-}
-
-// void BoundingSphere::update(Se3r& se3)
-// {
-// Vector3r v(radius,radius,radius);
-// center = se3.position;
-// min = center-v;
-// max = center+v;
-// }
-YADE_PLUGIN((BoundingSphere));
-
=== removed file 'pkg/common/DataClass/BoundingVolume/BoundingSphere.hpp'
--- pkg/common/DataClass/BoundingVolume/BoundingSphere.hpp 2009-07-17 20:50:55 +0000
+++ pkg/common/DataClass/BoundingVolume/BoundingSphere.hpp 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2004 by Olivier Galizzi *
-* olivier.galizzi@xxxxxxx *
-* *
-* This program is free software; it is licensed under the terms of the *
-* GNU General Public License v2 or later. See file LICENSE for details. *
-*************************************************************************/
-
-#pragma once
-
-#include<yade/core/BoundingVolume.hpp>
-
-class BoundingSphere : public BoundingVolume
-{
- public :
- Real radius;
- Vector3r center;
-
- BoundingSphere();
- virtual ~BoundingSphere();
-
- REGISTER_ATTRIBUTES(BoundingVolume,(radius)(center));
- REGISTER_CLASS_AND_BASE(BoundingSphere,BoundingVolume);
- REGISTER_CLASS_INDEX(BoundingSphere,BoundingVolume);
-};
-REGISTER_SERIALIZABLE(BoundingSphere);
-
-
=== removed directory 'pkg/common/DataClass/InteractionGeometry'
=== removed directory 'pkg/common/DataClass/Widgets'
=== removed directory 'pkg/common/Engine/FilterEngine'
=== modified file 'pkg/common/Engine/MetaEngine/BoundingVolumeEngineUnit.hpp'
--- pkg/common/Engine/MetaEngine/BoundingVolumeEngineUnit.hpp 2009-07-12 07:21:25 +0000
+++ pkg/common/Engine/MetaEngine/BoundingVolumeEngineUnit.hpp 2009-11-18 13:34:36 +0000
@@ -14,7 +14,7 @@
#include<yade/core/InteractingGeometry.hpp>
#include<yade/core/Body.hpp>
#include<yade/core/MetaBody.hpp>
-#include<yade/core/EngineUnit2D.hpp>
+#include<yade/core/EngineUnit.hpp>
#include <string>
=== modified file 'pkg/common/Engine/MetaEngine/BoundingVolumeMetaEngine.hpp'
--- pkg/common/Engine/MetaEngine/BoundingVolumeMetaEngine.hpp 2009-07-13 18:31:44 +0000
+++ pkg/common/Engine/MetaEngine/BoundingVolumeMetaEngine.hpp 2009-11-18 13:34:36 +0000
@@ -10,7 +10,7 @@
#include<yade/pkg-common/BoundingVolumeEngineUnit.hpp>
-#include<yade/core/MetaEngine2D.hpp>
+#include<yade/core/MetaEngine.hpp>
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
#include<yade/core/InteractingGeometry.hpp>
#include<yade/core/BoundingVolume.hpp>
=== modified file 'pkg/common/Engine/MetaEngine/ConstitutiveLaw.hpp'
--- pkg/common/Engine/MetaEngine/ConstitutiveLaw.hpp 2009-07-12 07:21:25 +0000
+++ pkg/common/Engine/MetaEngine/ConstitutiveLaw.hpp 2009-11-18 13:34:36 +0000
@@ -1,7 +1,7 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
#include<yade/core/Interaction.hpp>
-#include<yade/core/EngineUnit2D.hpp>
+#include<yade/core/EngineUnit.hpp>
#include<yade/core/MetaBody.hpp>
class ConstitutiveLaw: public EngineUnit2D <
=== modified file 'pkg/common/Engine/MetaEngine/ConstitutiveLawDispatcher.hpp'
--- pkg/common/Engine/MetaEngine/ConstitutiveLawDispatcher.hpp 2009-02-08 22:57:07 +0000
+++ pkg/common/Engine/MetaEngine/ConstitutiveLawDispatcher.hpp 2009-11-18 13:34:36 +0000
@@ -1,6 +1,6 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/core/MetaEngine2D.hpp>
+#include<yade/core/MetaEngine.hpp>
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
#include<yade/core/Interaction.hpp>
#include<yade/pkg-common/ConstitutiveLaw.hpp>
=== modified file 'pkg/common/Engine/MetaEngine/GeometricalModelEngineUnit.hpp'
--- pkg/common/Engine/MetaEngine/GeometricalModelEngineUnit.hpp 2009-11-17 12:26:35 +0000
+++ pkg/common/Engine/MetaEngine/GeometricalModelEngineUnit.hpp 2009-11-18 13:34:36 +0000
@@ -14,7 +14,7 @@
#include<yade/core/PhysicalParameters.hpp>
#include<yade/core/GeometricalModel.hpp>
#include<yade/core/Body.hpp>
-#include<yade/core/EngineUnit2D.hpp>
+#include<yade/core/EngineUnit.hpp>
#ifdef YADE_SHAPE
/*! \brief
=== modified file 'pkg/common/Engine/MetaEngine/GeometricalModelMetaEngine.hpp'
--- pkg/common/Engine/MetaEngine/GeometricalModelMetaEngine.hpp 2009-01-27 02:19:40 +0000
+++ pkg/common/Engine/MetaEngine/GeometricalModelMetaEngine.hpp 2009-11-18 13:34:36 +0000
@@ -9,7 +9,7 @@
#pragma once
#include<yade/pkg-common/GeometricalModelEngineUnit.hpp>
-#include<yade/core/MetaEngine2D.hpp>
+#include<yade/core/MetaEngine.hpp>
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
#include<yade/core/PhysicalParameters.hpp>
#include<yade/core/GeometricalModel.hpp>
=== modified file 'pkg/common/Engine/MetaEngine/InteractingGeometryEngineUnit.hpp'
--- pkg/common/Engine/MetaEngine/InteractingGeometryEngineUnit.hpp 2009-11-17 12:26:35 +0000
+++ pkg/common/Engine/MetaEngine/InteractingGeometryEngineUnit.hpp 2009-11-18 13:34:36 +0000
@@ -12,7 +12,7 @@
#include<yade/core/GeometricalModel.hpp>
#include<yade/core/Body.hpp>
#include<yade/core/MetaBody.hpp>
-#include<yade/core/EngineUnit2D.hpp>
+#include<yade/core/EngineUnit.hpp>
#include <string>
=== modified file 'pkg/common/Engine/MetaEngine/InteractingGeometryMetaEngine.hpp'
--- pkg/common/Engine/MetaEngine/InteractingGeometryMetaEngine.hpp 2009-01-27 02:19:40 +0000
+++ pkg/common/Engine/MetaEngine/InteractingGeometryMetaEngine.hpp 2009-11-18 13:34:36 +0000
@@ -10,7 +10,7 @@
#include<yade/pkg-common/InteractingGeometryEngineUnit.hpp>
-#include<yade/core/MetaEngine2D.hpp>
+#include<yade/core/MetaEngine.hpp>
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
#include<yade/core/GeometricalModel.hpp>
#include<yade/core/InteractingGeometry.hpp>
=== modified file 'pkg/common/Engine/MetaEngine/InteractionGeometryEngineUnit.hpp'
--- pkg/common/Engine/MetaEngine/InteractionGeometryEngineUnit.hpp 2009-07-12 07:21:25 +0000
+++ pkg/common/Engine/MetaEngine/InteractionGeometryEngineUnit.hpp 2009-11-18 13:34:36 +0000
@@ -11,7 +11,7 @@
#include<yade/core/InteractingGeometry.hpp>
#include<yade/lib-base/yadeWm3Extra.hpp>
#include<yade/core/Interaction.hpp>
-#include<yade/core/EngineUnit2D.hpp>
+#include<yade/core/EngineUnit.hpp>
#include <string>
=== modified file 'pkg/common/Engine/MetaEngine/InteractionGeometryMetaEngine.hpp'
--- pkg/common/Engine/MetaEngine/InteractionGeometryMetaEngine.hpp 2009-05-29 13:35:22 +0000
+++ pkg/common/Engine/MetaEngine/InteractionGeometryMetaEngine.hpp 2009-11-18 13:34:36 +0000
@@ -13,7 +13,7 @@
#include<yade/core/Interaction.hpp>
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
-#include<yade/core/MetaEngine2D.hpp>
+#include<yade/core/MetaEngine.hpp>
#include<yade/core/InteractingGeometry.hpp>
#include<yade/pkg-common/InteractionGeometryEngineUnit.hpp>
=== modified file 'pkg/common/Engine/MetaEngine/InteractionPhysicsEngineUnit.hpp'
--- pkg/common/Engine/MetaEngine/InteractionPhysicsEngineUnit.hpp 2009-07-12 07:21:25 +0000
+++ pkg/common/Engine/MetaEngine/InteractionPhysicsEngineUnit.hpp 2009-11-18 13:34:36 +0000
@@ -10,7 +10,7 @@
#include<yade/core/PhysicalParameters.hpp>
#include<yade/core/Interaction.hpp>
-#include<yade/core/EngineUnit2D.hpp>
+#include<yade/core/EngineUnit.hpp>
#include <string>
/*! \brief
=== modified file 'pkg/common/Engine/MetaEngine/InteractionPhysicsMetaEngine.hpp'
--- pkg/common/Engine/MetaEngine/InteractionPhysicsMetaEngine.hpp 2009-03-27 08:59:17 +0000
+++ pkg/common/Engine/MetaEngine/InteractionPhysicsMetaEngine.hpp 2009-11-18 13:34:36 +0000
@@ -9,7 +9,7 @@
#pragma once
-#include<yade/core/MetaEngine2D.hpp>
+#include<yade/core/MetaEngine.hpp>
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
#include<yade/core/PhysicalParameters.hpp>
#include<yade/core/Interaction.hpp>
=== modified file 'pkg/common/Engine/MetaEngine/PhysicalActionApplier.hpp'
--- pkg/common/Engine/MetaEngine/PhysicalActionApplier.hpp 2009-03-30 16:10:27 +0000
+++ pkg/common/Engine/MetaEngine/PhysicalActionApplier.hpp 2009-11-18 13:34:36 +0000
@@ -11,8 +11,7 @@
#pragma once
-#include<yade/core/MetaEngine2D.hpp>
-#include<yade/core/MetaEngine1D.hpp>
+#include<yade/core/MetaEngine.hpp>
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
#include<yade/pkg-common/PhysicalActionApplierUnit.hpp>
=== modified file 'pkg/common/Engine/MetaEngine/PhysicalActionApplierUnit.hpp'
--- pkg/common/Engine/MetaEngine/PhysicalActionApplierUnit.hpp 2009-07-13 20:39:27 +0000
+++ pkg/common/Engine/MetaEngine/PhysicalActionApplierUnit.hpp 2009-11-18 13:34:36 +0000
@@ -10,8 +10,7 @@
#include<yade/core/PhysicalParameters.hpp>
#include<yade/core/Body.hpp>
-#include<yade/core/EngineUnit2D.hpp>
-#include<yade/core/EngineUnit1D.hpp>
+#include<yade/core/EngineUnit.hpp>
class PhysicalActionApplierUnit: public EngineUnit1D<void,TYPELIST_3(const shared_ptr<PhysicalParameters>&,const Body*, MetaBody*)>{
public: virtual ~PhysicalActionApplierUnit();
=== modified file 'pkg/common/Engine/MetaEngine/PhysicalActionDamper.hpp'
--- pkg/common/Engine/MetaEngine/PhysicalActionDamper.hpp 2009-03-30 16:10:27 +0000
+++ pkg/common/Engine/MetaEngine/PhysicalActionDamper.hpp 2009-11-18 13:34:36 +0000
@@ -8,8 +8,7 @@
#pragma once
-#include<yade/core/MetaEngine2D.hpp>
-#include<yade/core/MetaEngine1D.hpp>
+#include<yade/core/MetaEngine.hpp>
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
#include<yade/pkg-common/PhysicalActionDamperUnit.hpp>
=== modified file 'pkg/common/Engine/MetaEngine/PhysicalActionDamperUnit.hpp'
--- pkg/common/Engine/MetaEngine/PhysicalActionDamperUnit.hpp 2009-07-13 20:39:27 +0000
+++ pkg/common/Engine/MetaEngine/PhysicalActionDamperUnit.hpp 2009-11-18 13:34:36 +0000
@@ -11,8 +11,7 @@
#include<yade/core/PhysicalParameters.hpp>
#include<yade/core/Body.hpp>
#include<yade/core/MetaBody.hpp>
-#include<yade/core/EngineUnit2D.hpp>
-#include<yade/core/EngineUnit1D.hpp>
+#include<yade/core/EngineUnit.hpp>
class PhysicalActionDamperUnit: public EngineUnit1D<void,TYPELIST_3(const shared_ptr<PhysicalParameters>&,const Body*, MetaBody*)>{
REGISTER_CLASS_AND_BASE(PhysicalActionDamperUnit,EngineUnit1D);
=== modified file 'pkg/common/Engine/MetaEngine/PhysicalParametersEngineUnit.hpp'
--- pkg/common/Engine/MetaEngine/PhysicalParametersEngineUnit.hpp 2009-07-12 07:21:25 +0000
+++ pkg/common/Engine/MetaEngine/PhysicalParametersEngineUnit.hpp 2009-11-18 13:34:36 +0000
@@ -10,7 +10,7 @@
#include<yade/core/PhysicalParameters.hpp>
#include<yade/core/Body.hpp>
-#include<yade/core/EngineUnit1D.hpp>
+#include<yade/core/EngineUnit.hpp>
#include<yade/core/BexContainer.hpp>
/*! \brief
=== modified file 'pkg/common/Engine/MetaEngine/PhysicalParametersMetaEngine.hpp'
--- pkg/common/Engine/MetaEngine/PhysicalParametersMetaEngine.hpp 2009-05-22 21:06:02 +0000
+++ pkg/common/Engine/MetaEngine/PhysicalParametersMetaEngine.hpp 2009-11-18 13:34:36 +0000
@@ -9,7 +9,7 @@
#pragma once
#include<yade/pkg-common/PhysicalParametersEngineUnit.hpp>
-#include<yade/core/MetaEngine1D.hpp>
+#include<yade/core/MetaEngine.hpp>
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
#include<yade/core/PhysicalParameters.hpp>
#include<yade/core/Body.hpp>
=== renamed file 'pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawAABB.cpp' => 'pkg/common/RenderingEngine/GLDrawAABB.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawAABB.hpp' => 'pkg/common/RenderingEngine/GLDrawAABB.hpp'
=== removed directory 'pkg/common/RenderingEngine/GLDrawBoundingVolume'
=== removed file 'pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.cpp'
--- pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.cpp 2009-08-03 10:02:11 +0000
+++ pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.cpp 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2004 by Olivier Galizzi *
-* olivier.galizzi@xxxxxxx *
-* *
-* This program is free software; it is licensed under the terms of the *
-* GNU General Public License v2 or later. See file LICENSE for details. *
-*************************************************************************/
-
-#include"GLDrawBoundingSphere.hpp"
-#include<yade/pkg-common/BoundingSphere.hpp>
-#include<yade/lib-opengl/OpenGLWrapper.hpp>
-
-void GLDrawBoundingSphere::go(const shared_ptr<BoundingVolume>& bv)
-{
- BoundingSphere * s = static_cast<BoundingSphere*>(bv.get());
- glColor3v(bv->diffuseColor);
- glTranslate(s->center[0],s->center[1],s->center[2]);
- glutWireSphere(s->radius,10,10);
-}
-
-YADE_PLUGIN((GLDrawBoundingSphere));
-YADE_REQUIRE_FEATURE(OPENGL)
=== removed file 'pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.hpp'
--- pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.hpp 2009-01-27 02:19:40 +0000
+++ pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.hpp 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2004 by Olivier Galizzi *
-* olivier.galizzi@xxxxxxx *
-* *
-* This program is free software; it is licensed under the terms of the *
-* GNU General Public License v2 or later. See file LICENSE for details. *
-*************************************************************************/
-
-#pragma once
-
-#include<yade/pkg-common/GLDrawFunctors.hpp>
-
-class GLDrawBoundingSphere : public GLDrawBoundingVolumeFunctor
-{
- public :
- virtual void go(const shared_ptr<BoundingVolume>&);
-
- RENDERS(BoundingSphere);
- REGISTER_CLASS_NAME(GLDrawBoundingSphere);
- REGISTER_BASE_CLASS_NAME(GLDrawBoundingVolumeFunctor);
-};
-
-REGISTER_SERIALIZABLE(GLDrawBoundingSphere);
-
-
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawBox.cpp' => 'pkg/common/RenderingEngine/GLDrawBox.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawBox.hpp' => 'pkg/common/RenderingEngine/GLDrawBox.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawBoxShadowVolume.cpp' => 'pkg/common/RenderingEngine/GLDrawBoxShadowVolume.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawBoxShadowVolume.hpp' => 'pkg/common/RenderingEngine/GLDrawBoxShadowVolume.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawBssSweptSphereLineSegment.cpp' => 'pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawBssSweptSphereLineSegment.hpp' => 'pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawFacet.cpp' => 'pkg/common/RenderingEngine/GLDrawFacet.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawFacet.hpp' => 'pkg/common/RenderingEngine/GLDrawFacet.hpp'
=== renamed file 'pkg/common/RenderingEngine/OpenGLRenderingEngine/GLDrawFunctors.hpp' => 'pkg/common/RenderingEngine/GLDrawFunctors.hpp'
--- pkg/common/RenderingEngine/OpenGLRenderingEngine/GLDrawFunctors.hpp 2009-11-17 08:55:09 +0000
+++ pkg/common/RenderingEngine/GLDrawFunctors.hpp 2009-11-18 13:34:36 +0000
@@ -10,7 +10,7 @@
#include<yade/core/GeometricalModel.hpp>
#endif
#include<yade/core/InteractingGeometry.hpp>
-#include<yade/core/EngineUnit1D.hpp>
+#include<yade/core/EngineUnit.hpp>
#include<yade/core/InteractionGeometry.hpp>
#include<yade/core/Body.hpp>
#include<yade/core/InteractionPhysics.hpp>
=== removed directory 'pkg/common/RenderingEngine/GLDrawGeometricalModel'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingBox.cpp' => 'pkg/common/RenderingEngine/GLDrawInteractingBox.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingBox.hpp' => 'pkg/common/RenderingEngine/GLDrawInteractingBox.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingFacet.cpp' => 'pkg/common/RenderingEngine/GLDrawInteractingFacet.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingFacet.hpp' => 'pkg/common/RenderingEngine/GLDrawInteractingFacet.hpp'
=== removed directory 'pkg/common/RenderingEngine/GLDrawInteractingGeometry'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.cpp' => 'pkg/common/RenderingEngine/GLDrawInteractingSphere.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.hpp' => 'pkg/common/RenderingEngine/GLDrawInteractingSphere.hpp'
=== removed directory 'pkg/common/RenderingEngine/GLDrawInteractionGeometry'
=== removed directory 'pkg/common/RenderingEngine/GLDrawInteractionPhysics'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawMetaInteractingGeometry.cpp' => 'pkg/common/RenderingEngine/GLDrawMetaInteractingGeometry.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawMetaInteractingGeometry.hpp' => 'pkg/common/RenderingEngine/GLDrawMetaInteractingGeometry.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractionPhysics/GLDrawNormalInteraction.cpp' => 'pkg/common/RenderingEngine/GLDrawNormalInteraction.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawInteractionPhysics/GLDrawNormalInteraction.hpp' => 'pkg/common/RenderingEngine/GLDrawNormalInteraction.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawState/GLDrawParticleState.cpp' => 'pkg/common/RenderingEngine/GLDrawParticleState.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawState/GLDrawParticleState.hpp' => 'pkg/common/RenderingEngine/GLDrawParticleState.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawQuadrilateral.cpp' => 'pkg/common/RenderingEngine/GLDrawQuadrilateral.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawQuadrilateral.hpp' => 'pkg/common/RenderingEngine/GLDrawQuadrilateral.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawState/GLDrawRigidBodyState.cpp' => 'pkg/common/RenderingEngine/GLDrawRigidBodyState.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawState/GLDrawRigidBodyState.hpp' => 'pkg/common/RenderingEngine/GLDrawRigidBodyState.hpp'
=== removed directory 'pkg/common/RenderingEngine/GLDrawShadowVolume'
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.cpp' => 'pkg/common/RenderingEngine/GLDrawSphere.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.hpp' => 'pkg/common/RenderingEngine/GLDrawSphere.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawSphereShadowVolume.cpp' => 'pkg/common/RenderingEngine/GLDrawSphereShadowVolume.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawSphereShadowVolume.hpp' => 'pkg/common/RenderingEngine/GLDrawSphereShadowVolume.hpp'
=== removed directory 'pkg/common/RenderingEngine/GLDrawState'
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTetrahedron.cpp' => 'pkg/common/RenderingEngine/GLDrawTetrahedron.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTetrahedron.hpp' => 'pkg/common/RenderingEngine/GLDrawTetrahedron.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTube.cpp' => 'pkg/common/RenderingEngine/GLDrawTube.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTube.hpp' => 'pkg/common/RenderingEngine/GLDrawTube.hpp'
=== removed directory 'pkg/common/RenderingEngine/GLDrawWidgets'
=== removed directory 'pkg/common/RenderingEngine/OpenGLRenderingEngine'
=== renamed file 'pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.cpp' => 'pkg/common/RenderingEngine/OpenGLRenderingEngine.cpp'
=== renamed file 'pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.hpp' => 'pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp'
--- pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.hpp 2009-11-17 12:26:35 +0000
+++ pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp 2009-11-18 13:34:36 +0000
@@ -4,7 +4,7 @@
#include<yade/core/RenderingEngine.hpp>
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
-#include<yade/core/MetaEngine1D.hpp>
+#include<yade/core/MetaEngine.hpp>
#include<yade/core/Body.hpp>
#include<yade/lib-opengl/OpenGLWrapper.hpp>
=== removed directory 'pkg/dem/DataClass/InteractingGeometry'
=== modified file 'pkg/dem/DataClass/InteractionPhysics/CapillaryParameters.cpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/DataClass/InteractionPhysics/CapillaryParameters.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/DeusExMachina/CapillaryPressureEngine.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/DeusExMachina/CapillaryRecorder.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/DeusExMachina/CapillaryStressRecorder.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/DeusExMachina/ContactStressRecorder.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/DeusExMachina/SampleCapillaryPressureEngine.cpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/DeusExMachina/SampleCapillaryPressureEngine.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/DeusExMachina/WallStressRecorder.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/EngineUnit/SimpleElasticRelationshipsWater.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/StandAloneEngine/CapillaryCohesiveLaw.cpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/StandAloneEngine/CapillaryCohesiveLaw.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/StandAloneEngine/MicroMacroAnalyser.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/StandAloneEngine/ViscousForceDamping.cpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/StandAloneEngine/ViscousForceDamping.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/PreProcessor/TriaxialTestWater.cpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/PreProcessor/TriaxialTestWater.hpp' (properties changed: +x to -x)
=== removed directory 'pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.cpp' => 'pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.hpp' => 'pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp'
=== removed directory 'pkg/dem/RenderingEngine/GLDrawElasticContactInteraction'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawElasticContactInteraction/GLDrawElasticContactInteraction.cpp' => 'pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.cpp'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawElasticContactInteraction/GLDrawElasticContactInteraction.hpp' => 'pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.hpp'
=== removed directory 'pkg/dem/RenderingEngine/GLDrawInteractingMyTetrahedron'
=== removed directory 'pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction'
=== removed directory 'pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.cpp' => 'pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.cpp'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.hpp' => 'pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.hpp'
=== removed directory 'pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.cpp' => 'pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.cpp'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.hpp' => 'pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.hpp'
=== removed directory 'pkg/lattice/RenderingEngine/GLDrawLatticeBeamState'
=== renamed file 'pkg/lattice/RenderingEngine/GLDrawLatticeBeamState/GLDrawLatticeBeamState.cpp' => 'pkg/lattice/RenderingEngine/GLDrawLatticeBeamState.cpp'
=== renamed file 'pkg/lattice/RenderingEngine/GLDrawLatticeBeamState/GLDrawLatticeBeamState.hpp' => 'pkg/lattice/RenderingEngine/GLDrawLatticeBeamState.hpp'
=== removed directory 'pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry'
=== renamed file 'pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry/GLDrawLatticeInteractingGeometry.cpp' => 'pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry.cpp'
=== renamed file 'pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry/GLDrawLatticeInteractingGeometry.hpp' => 'pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry.hpp'
=== removed directory 'pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry'
=== renamed file 'pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry/GLDrawLatticeSetGeometry.cpp' => 'pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry.cpp'
=== renamed file 'pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry/GLDrawLatticeSetGeometry.hpp' => 'pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry.hpp'
=== removed directory 'pkg/lattice/RenderingEngine/GLDrawLineSegment'
=== renamed file 'pkg/lattice/RenderingEngine/GLDrawLineSegment/GLDrawLineSegment.cpp' => 'pkg/lattice/RenderingEngine/GLDrawLineSegment.cpp'
=== renamed file 'pkg/lattice/RenderingEngine/GLDrawLineSegment/GLDrawLineSegment.hpp' => 'pkg/lattice/RenderingEngine/GLDrawLineSegment.hpp'
=== modified file 'py/yadeWrapper/yadeWrapper.cpp'
--- py/yadeWrapper/yadeWrapper.cpp 2009-11-17 12:26:35 +0000
+++ py/yadeWrapper/yadeWrapper.cpp 2009-11-18 13:34:36 +0000
@@ -31,14 +31,11 @@
#include<yade/pkg-dem/STLImporter.hpp>
#include<yade/core/MetaEngine.hpp>
-#include<yade/core/MetaEngine1D.hpp>
-#include<yade/core/MetaEngine2D.hpp>
#include<yade/core/StandAloneEngine.hpp>
#include<yade/core/DeusExMachina.hpp>
#include<yade/core/EngineUnit.hpp>
#include<yade/pkg-common/ParallelEngine.hpp>
-#include<yade/core/EngineUnit1D.hpp>
-#include<yade/core/EngineUnit2D.hpp>
+#include<yade/core/EngineUnit.hpp>
#include<yade/pkg-common/BoundingVolumeMetaEngine.hpp>
#ifdef YADE_SHAPE
