------------------------------------------------------------ revno: 1836 committer: Václav Šmilauer <[email protected]> branch nick: trunk timestamp: Tue 2009-12-01 15:56:39 +0100 message: 1. Rename MetaBody to World (it had to be done at some point, regardless of what the name is) 2. Add Engine::world, set before every call in moveToNextTimestep 3. Change names of a few related methods renamed: core/MetaBody.cpp => core/World.cpp core/MetaBody.hpp => core/World.hpp modified: core/BexContainer.hpp core/Body.cpp core/Body.hpp core/DeusExMachina.cpp core/DeusExMachina.hpp core/Dispatcher.cpp core/Dispatcher.hpp core/Engine.hpp core/FileGenerator.hpp core/Functor.hpp core/Interaction.cpp core/Interaction.hpp core/InteractionContainer.hpp core/Material.cpp core/Material.hpp core/NullGUI.cpp core/Omega.cpp core/Omega.hpp core/RenderingEngine.hpp core/SConscript core/SimulationFlow.cpp core/TimeStepper.cpp core/TimeStepper.hpp core/main/main.cpp core/main/main.py gui/py/PythonUI_rc.py gui/qt3/GLViewer.cpp gui/qt3/GLViewer.hpp gui/qt3/QtGUI-python.cpp gui/qt3/SimulationController.cpp gui/qt3/SnapshotEngine.cpp gui/qt3/SnapshotEngine.hpp gui/qt3/YadeQtMainWindow.cpp pkg/common/DataClass/GeometricalModel/Quadrilateral.cpp pkg/common/DataClass/GeometricalModel/Quadrilateral.hpp pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.hpp pkg/common/DataClass/VelocityBins.cpp pkg/common/DataClass/VelocityBins.hpp pkg/common/Engine/DeusExMachina/CinemCNCEngine.cpp pkg/common/Engine/DeusExMachina/CinemCNCEngine.hpp pkg/common/Engine/DeusExMachina/CinemCisEngine.cpp pkg/common/Engine/DeusExMachina/CinemCisEngine.hpp pkg/common/Engine/DeusExMachina/CinemDNCEngine.cpp pkg/common/Engine/DeusExMachina/CinemDNCEngine.hpp pkg/common/Engine/DeusExMachina/CinemKNCEngine.cpp pkg/common/Engine/DeusExMachina/CinemKNCEngine.hpp pkg/common/Engine/DeusExMachina/DisplacementEngine.cpp pkg/common/Engine/DeusExMachina/DisplacementEngine.hpp pkg/common/Engine/DeusExMachina/DisplacementToForceEngine.cpp pkg/common/Engine/DeusExMachina/DisplacementToForceEngine.hpp pkg/common/Engine/DeusExMachina/ForceEngine.cpp pkg/common/Engine/DeusExMachina/ForceEngine.hpp pkg/common/Engine/DeusExMachina/GravityEngines.cpp pkg/common/Engine/DeusExMachina/GravityEngines.hpp pkg/common/Engine/DeusExMachina/JumpChangeSe3.hpp pkg/common/Engine/DeusExMachina/MomentEngine.cpp pkg/common/Engine/DeusExMachina/MomentEngine.hpp pkg/common/Engine/DeusExMachina/PressTestEngine.cpp pkg/common/Engine/DeusExMachina/PressTestEngine.hpp pkg/common/Engine/DeusExMachina/RotationEngine.cpp pkg/common/Engine/DeusExMachina/RotationEngine.hpp pkg/common/Engine/DeusExMachina/Se3Interpolator.cpp pkg/common/Engine/DeusExMachina/Se3Interpolator.hpp pkg/common/Engine/DeusExMachina/StaticAttractionEngine.cpp pkg/common/Engine/DeusExMachina/StaticAttractionEngine.hpp pkg/common/Engine/DeusExMachina/TranslationEngine.cpp pkg/common/Engine/DeusExMachina/TranslationEngine.hpp pkg/common/Engine/Dispatcher/BoundingVolumeDispatcher.cpp pkg/common/Engine/Dispatcher/BoundingVolumeDispatcher.hpp pkg/common/Engine/Dispatcher/BoundingVolumeFunctor.hpp pkg/common/Engine/Dispatcher/ConstitutiveLaw.hpp pkg/common/Engine/Dispatcher/ConstitutiveLawDispatcher.cpp pkg/common/Engine/Dispatcher/ConstitutiveLawDispatcher.hpp pkg/common/Engine/Dispatcher/GeometricalModelMetaEngine.cpp pkg/common/Engine/Dispatcher/GeometricalModelMetaEngine.hpp pkg/common/Engine/Dispatcher/InteractingGeometryEngineUnit.hpp pkg/common/Engine/Dispatcher/InteractingGeometryMetaEngine.cpp pkg/common/Engine/Dispatcher/InteractingGeometryMetaEngine.hpp pkg/common/Engine/Dispatcher/InteractionDispatchers.cpp pkg/common/Engine/Dispatcher/InteractionDispatchers.hpp pkg/common/Engine/Dispatcher/InteractionGeometryDispatcher.cpp pkg/common/Engine/Dispatcher/InteractionGeometryDispatcher.hpp pkg/common/Engine/Dispatcher/InteractionPhysicsDispatcher.cpp pkg/common/Engine/Dispatcher/InteractionPhysicsDispatcher.hpp pkg/common/Engine/Dispatcher/PhysicalActionApplier.cpp pkg/common/Engine/Dispatcher/PhysicalActionApplier.hpp pkg/common/Engine/Dispatcher/PhysicalActionApplierUnit.hpp pkg/common/Engine/Dispatcher/PhysicalActionDamper.cpp pkg/common/Engine/Dispatcher/PhysicalActionDamper.hpp pkg/common/Engine/Dispatcher/PhysicalActionDamperUnit.hpp pkg/common/Engine/Dispatcher/StateMetaEngine.cpp pkg/common/Engine/Dispatcher/StateMetaEngine.hpp pkg/common/Engine/Functor/CundallNonViscousDamping.cpp pkg/common/Engine/Functor/CundallNonViscousDamping.hpp pkg/common/Engine/Functor/ElasticBodySimpleRelationship.cpp pkg/common/Engine/Functor/MetaInteractingGeometry2AABB.cpp pkg/common/Engine/Functor/NewtonsForceLaw.cpp pkg/common/Engine/Functor/NewtonsForceLaw.hpp pkg/common/Engine/Functor/NewtonsMomentumLaw.cpp pkg/common/Engine/Functor/NewtonsMomentumLaw.hpp pkg/common/Engine/Functor/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.cpp pkg/common/Engine/ParallelEngine.cpp pkg/common/Engine/ParallelEngine.hpp pkg/common/Engine/StandAloneEngine/InsertionSortCollider.cpp pkg/common/Engine/StandAloneEngine/InsertionSortCollider.hpp pkg/common/Engine/StandAloneEngine/PeriodicEngines.hpp pkg/common/Engine/StandAloneEngine/PeriodicPythonRunner.hpp pkg/common/Engine/StandAloneEngine/PersistentTriangulationCollider.cpp pkg/common/Engine/StandAloneEngine/PersistentTriangulationCollider.hpp pkg/common/Engine/StandAloneEngine/PhysicalActionContainerReseter.cpp pkg/common/Engine/StandAloneEngine/PhysicalActionContainerReseter.hpp pkg/common/Engine/StandAloneEngine/Recorder.hpp pkg/common/Engine/StandAloneEngine/ResetPositionEngine.cpp pkg/common/Engine/StandAloneEngine/ResetPositionEngine.hpp pkg/common/Engine/StandAloneEngine/ResetRandomPosition.cpp pkg/common/Engine/StandAloneEngine/ResetRandomPosition.hpp pkg/common/Engine/StandAloneEngine/SpatialQuickSortCollider.cpp pkg/common/Engine/StandAloneEngine/SpatialQuickSortCollider.hpp pkg/common/Engine/StandAloneEngine/SpheresFactory.cpp pkg/common/Engine/StandAloneEngine/SpheresFactory.hpp pkg/common/RenderingEngine/GLDrawQuadrilateral.cpp pkg/common/RenderingEngine/OpenGLRenderingEngine.cpp pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp pkg/dem/DataClass/Clump.cpp pkg/dem/DataClass/Clump.hpp pkg/dem/DataClass/SpherePack.cpp pkg/dem/Engine/DeusExMachina/CapillaryPressureEngine.cpp pkg/dem/Engine/DeusExMachina/CapillaryPressureEngine.hpp pkg/dem/Engine/DeusExMachina/CapillaryRecorder.cpp pkg/dem/Engine/DeusExMachina/CapillaryRecorder.hpp pkg/dem/Engine/DeusExMachina/CapillaryStressRecorder.cpp pkg/dem/Engine/DeusExMachina/CapillaryStressRecorder.hpp pkg/dem/Engine/DeusExMachina/ContactStressRecorder.cpp pkg/dem/Engine/DeusExMachina/ContactStressRecorder.hpp pkg/dem/Engine/DeusExMachina/FlowEngine.cpp pkg/dem/Engine/DeusExMachina/FlowEngine.hpp pkg/dem/Engine/DeusExMachina/HydraulicForceEngine.cpp pkg/dem/Engine/DeusExMachina/HydraulicForceEngine.hpp pkg/dem/Engine/DeusExMachina/SampleCapillaryPressureEngine.cpp pkg/dem/Engine/DeusExMachina/SampleCapillaryPressureEngine.hpp pkg/dem/Engine/DeusExMachina/StaticSpheresAttractionEngine.cpp pkg/dem/Engine/DeusExMachina/StaticSpheresAttractionEngine.hpp pkg/dem/Engine/DeusExMachina/ThreeDTriaxialEngine.cpp pkg/dem/Engine/DeusExMachina/ThreeDTriaxialEngine.hpp pkg/dem/Engine/DeusExMachina/TriaxialCompressionEngine.cpp pkg/dem/Engine/DeusExMachina/TriaxialCompressionEngine.hpp pkg/dem/Engine/DeusExMachina/TriaxialStateRecorder.cpp pkg/dem/Engine/DeusExMachina/TriaxialStateRecorder.hpp pkg/dem/Engine/DeusExMachina/TriaxialStressController.cpp pkg/dem/Engine/DeusExMachina/TriaxialStressController.hpp pkg/dem/Engine/DeusExMachina/WallStressRecorder.cpp pkg/dem/Engine/DeusExMachina/WallStressRecorder.hpp pkg/dem/Engine/Functor/BasicViscoelasticRelationships.cpp pkg/dem/Engine/Functor/CL1Relationships.cpp pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp pkg/dem/Engine/Functor/MacroMicroElasticRelationships.cpp pkg/dem/Engine/Functor/SimpleElasticRelationships.cpp pkg/dem/Engine/Functor/SimpleElasticRelationshipsWater.cpp pkg/dem/Engine/Functor/SimpleViscoelasticRelationships.cpp pkg/dem/Engine/Functor/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.cpp pkg/dem/Engine/Functor/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.hpp pkg/dem/Engine/Functor/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp pkg/dem/Engine/Functor/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.hpp pkg/dem/Engine/StandAloneEngine/AveragePositionRecorder.cpp pkg/dem/Engine/StandAloneEngine/AveragePositionRecorder.hpp pkg/dem/Engine/StandAloneEngine/CapillaryCohesiveLaw.cpp pkg/dem/Engine/StandAloneEngine/CapillaryCohesiveLaw.hpp pkg/dem/Engine/StandAloneEngine/CohesiveFrictionalContactLaw.cpp pkg/dem/Engine/StandAloneEngine/CohesiveFrictionalContactLaw.hpp pkg/dem/Engine/StandAloneEngine/CohesiveStateRPMRecorder.cpp pkg/dem/Engine/StandAloneEngine/CohesiveStateRPMRecorder.hpp pkg/dem/Engine/StandAloneEngine/ContactLaw1.cpp pkg/dem/Engine/StandAloneEngine/ContactLaw1.hpp pkg/dem/Engine/StandAloneEngine/ElasticCohesiveLaw.cpp pkg/dem/Engine/StandAloneEngine/ElasticCohesiveLaw.hpp pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.cpp pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.hpp pkg/dem/Engine/StandAloneEngine/ElasticCriterionTimeStepper.cpp pkg/dem/Engine/StandAloneEngine/ElasticCriterionTimeStepper.hpp pkg/dem/Engine/StandAloneEngine/FacetTopologyAnalyzer.cpp pkg/dem/Engine/StandAloneEngine/FacetTopologyAnalyzer.hpp pkg/dem/Engine/StandAloneEngine/ForceRecorder.cpp pkg/dem/Engine/StandAloneEngine/ForceRecorder.hpp pkg/dem/Engine/StandAloneEngine/ForceSnapshot.cpp pkg/dem/Engine/StandAloneEngine/ForceSnapshot.hpp pkg/dem/Engine/StandAloneEngine/GeometricalModelForceColorizer.cpp pkg/dem/Engine/StandAloneEngine/GeometricalModelForceColorizer.hpp pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.cpp pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.hpp pkg/dem/Engine/StandAloneEngine/HistoryRecorder.cpp pkg/dem/Engine/StandAloneEngine/HistoryRecorder.hpp pkg/dem/Engine/StandAloneEngine/MGPRecorder.cpp pkg/dem/Engine/StandAloneEngine/MGPRecorder.hpp pkg/dem/Engine/StandAloneEngine/MicroMacroAnalyser.cpp pkg/dem/Engine/StandAloneEngine/MicroMacroAnalyser.hpp pkg/dem/Engine/StandAloneEngine/NewtonsDampedLaw.cpp pkg/dem/Engine/StandAloneEngine/NewtonsDampedLaw.hpp pkg/dem/Engine/StandAloneEngine/PeriIsoCompressor.cpp pkg/dem/Engine/StandAloneEngine/PeriIsoCompressor.hpp pkg/dem/Engine/StandAloneEngine/PositionOrientationRecorder.cpp pkg/dem/Engine/StandAloneEngine/PositionOrientationRecorder.hpp pkg/dem/Engine/StandAloneEngine/PositionRecorder.cpp pkg/dem/Engine/StandAloneEngine/PositionRecorder.hpp pkg/dem/Engine/StandAloneEngine/PositionSnapshot.cpp pkg/dem/Engine/StandAloneEngine/PositionSnapshot.hpp pkg/dem/Engine/StandAloneEngine/RigidBodyRecorder.cpp pkg/dem/Engine/StandAloneEngine/RigidBodyRecorder.hpp pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.hpp pkg/dem/Engine/StandAloneEngine/UniaxialStrainer.cpp pkg/dem/Engine/StandAloneEngine/UniaxialStrainer.hpp pkg/dem/Engine/StandAloneEngine/VTKRecorder.cpp pkg/dem/Engine/StandAloneEngine/VTKRecorder.hpp pkg/dem/Engine/StandAloneEngine/VelocityRecorder.cpp pkg/dem/Engine/StandAloneEngine/VelocityRecorder.hpp pkg/dem/Engine/StandAloneEngine/ViscousForceDamping.cpp pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.cpp pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.hpp pkg/dem/PreProcessor/ClumpTestGen.cpp pkg/dem/PreProcessor/ClumpTestGen.hpp pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp pkg/dem/PreProcessor/CohesiveTriaxialTest.hpp pkg/dem/PreProcessor/DirectShearCis.cpp pkg/dem/PreProcessor/DirectShearCis.hpp pkg/dem/PreProcessor/Funnel.cpp pkg/dem/PreProcessor/Funnel.hpp pkg/dem/PreProcessor/HydraulicTest.cpp pkg/dem/PreProcessor/HydraulicTest.hpp pkg/dem/PreProcessor/MembraneTest.cpp pkg/dem/PreProcessor/MembraneTest.hpp pkg/dem/PreProcessor/ModifiedTriaxialTest.cpp pkg/dem/PreProcessor/ModifiedTriaxialTest.hpp pkg/dem/PreProcessor/SDECImpactTest.cpp pkg/dem/PreProcessor/SDECImpactTest.hpp pkg/dem/PreProcessor/SDECLinkedSpheres.cpp pkg/dem/PreProcessor/SDECLinkedSpheres.hpp pkg/dem/PreProcessor/SDECMovingWall.cpp pkg/dem/PreProcessor/SDECMovingWall.hpp pkg/dem/PreProcessor/SDECSpheresPlane.cpp pkg/dem/PreProcessor/SDECSpheresPlane.hpp pkg/dem/PreProcessor/STLImporterTest.cpp pkg/dem/PreProcessor/STLImporterTest.hpp pkg/dem/PreProcessor/SimpleShear.cpp pkg/dem/PreProcessor/SimpleShear.hpp pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp pkg/dem/PreProcessor/TestSimpleViscoelastic.hpp pkg/dem/PreProcessor/TetraTestGen.cpp pkg/dem/PreProcessor/ThreePointBending.cpp pkg/dem/PreProcessor/ThreePointBending.hpp pkg/dem/PreProcessor/TriaxialTest.cpp pkg/dem/PreProcessor/TriaxialTest.hpp pkg/dem/PreProcessor/TriaxialTestWater.cpp pkg/dem/PreProcessor/TriaxialTestWater.hpp pkg/dem/meta/BasicPM.cpp pkg/dem/meta/BasicPM.hpp pkg/dem/meta/ConcretePM.cpp pkg/dem/meta/ConcretePM.hpp pkg/dem/meta/RockPM.cpp pkg/dem/meta/RockPM.hpp pkg/dem/meta/Shop.cpp pkg/dem/meta/Shop.hpp pkg/dem/meta/Tetra.cpp pkg/dem/meta/Tetra.hpp pkg/dem/meta/ViscoelasticPM.cpp pkg/dem/meta/ViscoelasticPM.hpp pkg/lattice/Engine/EngineUnit/LatticeSet2LatticeBeams.cpp pkg/lattice/Engine/StandAloneEngine/BeamRecorder.cpp pkg/lattice/Engine/StandAloneEngine/BeamRecorder.hpp pkg/lattice/Engine/StandAloneEngine/LatticeLaw.cpp pkg/lattice/Engine/StandAloneEngine/LatticeLaw.hpp pkg/lattice/Engine/StandAloneEngine/MeasurePoisson.cpp pkg/lattice/Engine/StandAloneEngine/MeasurePoisson.hpp pkg/lattice/Engine/StandAloneEngine/MovingSupport.cpp pkg/lattice/Engine/StandAloneEngine/MovingSupport.hpp pkg/lattice/Engine/StandAloneEngine/NodeRecorder.cpp pkg/lattice/Engine/StandAloneEngine/NodeRecorder.hpp pkg/lattice/Engine/StandAloneEngine/NonLocalInitializer.cpp pkg/lattice/Engine/StandAloneEngine/NonLocalInitializer.hpp pkg/lattice/Engine/StandAloneEngine/StrainRecorder.cpp pkg/lattice/Engine/StandAloneEngine/StrainRecorder.hpp pkg/lattice/PreProcessor/LatticeExample.cpp pkg/lattice/PreProcessor/LatticeExample.hpp pkg/lattice/PreProcessor/LatticeExampleCTData.cpp pkg/lattice/PreProcessor/LatticeExampleCTData.hpp pkg/lattice/PreProcessor/LatticeExampleSimple.cpp pkg/lattice/PreProcessor/LatticeExampleSimple.hpp pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry.cpp pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry.cpp pkg/snow/Engine/ElawSnowLayersDeformation.cpp pkg/snow/Engine/ElawSnowLayersDeformation.hpp pkg/snow/PreProcessor/SnowCreepTest.cpp pkg/snow/PreProcessor/SnowCreepTest.hpp pkg/snow/PreProcessor/SnowVoxelsLoader.cpp pkg/snow/PreProcessor/SnowVoxelsLoader.hpp pkg/snow/RenderingEngine/Ef1_BshSnowGrain_glDraw.cpp pkg/snow/RenderingEngine/Ef1_IstSnowLayersContact_glDraw.cpp py/_eudoxos.cpp py/_utils.cpp py/tests/wrapper.py py/yadeWrapper/yadeWrapper.cpp core/World.cpp core/World.hpp The size of the diff (8267 lines) is larger than your specified limit of 1000 lines
-- 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. _______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
