yade-dev team mailing list archive

Thread
Date
[Branch ~yade-dev/yade/trunk] Rev 1806: REMOVED PhysicalParameters, add Material and State classes.

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Sat, 21 Nov 2009 16:49:12 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx
Merge authors:
  Václav Šmilauer (eudoxos)
------------------------------------------------------------
revno: 1806 [merge]
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Sat 2009-11-21 17:46:58 +0100
message:
  REMOVED PhysicalParameters, add Material and State classes.
  DISABLED many (most) plugins, I ask the respective authors/users to fix them.
  
  Documentation on the conversion process is at https://yade.hmg.inpg.fr/index.php/Material_and_State_classes
  
  Sorry for inconvenience.
added:
  pkg/common/DataClass/Material/
  pkg/common/DataClass/Material/ElasticMat.cpp
  pkg/common/DataClass/Material/ElasticMat.hpp
renamed:
  pkg/common/Engine/MetaEngine/PhysicalParametersEngineUnit.cpp => pkg/common/Engine/MetaEngine/StateEngineUnit.cpp
  pkg/common/Engine/MetaEngine/PhysicalParametersEngineUnit.hpp => pkg/common/Engine/MetaEngine/StateEngineUnit.hpp
  pkg/common/Engine/MetaEngine/PhysicalParametersMetaEngine.cpp => pkg/common/Engine/MetaEngine/StateMetaEngine.cpp
  pkg/common/Engine/MetaEngine/PhysicalParametersMetaEngine.hpp => pkg/common/Engine/MetaEngine/StateMetaEngine.hpp
modified:
  SConstruct
  core/Body.cpp
  core/Body.hpp
  core/Material.hpp
  core/MetaBody.cpp
  core/PhysicalParameters.hpp
  core/SConscript
  core/State.cpp
  core/State.hpp
  extra/PeriodicInsertionSortCollider.cpp
  extra/PeriodicInsertionSortCollider.hpp
  gui/SConscript
  gui/py/PythonUI_rc.py
  gui/qt3/GLViewer.cpp
  lib/base/yadeWm3Extra.hpp
  pkg/common/DataClass/GeometricalModel/Box.cpp
  pkg/common/DataClass/GeometricalModel/BshTube.cpp
  pkg/common/DataClass/GeometricalModel/Facet.cpp
  pkg/common/DataClass/GeometricalModel/Quadrilateral.cpp
  pkg/common/DataClass/GeometricalModel/Sphere.cpp
  pkg/common/DataClass/GeometricalModel/Tetrahedron.cpp
  pkg/common/DataClass/InteractingGeometry/BssSweptSphereLineSegment.cpp
  pkg/common/DataClass/InteractingGeometry/InteractingNode.cpp
  pkg/common/DataClass/InteractingGeometry/InteractingSphere.cpp
  pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.cpp
  pkg/common/DataClass/InteractingGeometry/Wall.cpp
  pkg/common/DataClass/InteractingGeometry/Wall.hpp
  pkg/common/DataClass/InteractionPhysics/NormalShearInteractions.cpp
  pkg/common/DataClass/PhysicalParameters/BcpConnection.cpp
  pkg/common/DataClass/PhysicalParameters/ElasticBodyParameters.cpp
  pkg/common/DataClass/PhysicalParameters/ParticleParameters.cpp
  pkg/common/DataClass/PhysicalParameters/RigidBodyParameters.cpp
  pkg/common/DataClass/VelocityBins.cpp
  pkg/common/DataClass/VelocityBins.hpp
  pkg/common/Engine/DeusExMachina/CinemCNCEngine.cpp
  pkg/common/Engine/DeusExMachina/CinemCisEngine.cpp
  pkg/common/Engine/DeusExMachina/CinemDNCEngine.cpp
  pkg/common/Engine/DeusExMachina/CinemKNCEngine.cpp
  pkg/common/Engine/DeusExMachina/DisplacementEngine.cpp
  pkg/common/Engine/DeusExMachina/DisplacementToForceEngine.cpp
  pkg/common/Engine/DeusExMachina/ForceEngine.cpp
  pkg/common/Engine/DeusExMachina/GravityEngines.cpp
  pkg/common/Engine/DeusExMachina/JumpChangeSe3.cpp
  pkg/common/Engine/DeusExMachina/JumpChangeSe3.hpp
  pkg/common/Engine/DeusExMachina/MomentEngine.cpp
  pkg/common/Engine/DeusExMachina/PressTestEngine.cpp
  pkg/common/Engine/DeusExMachina/RotationEngine.cpp
  pkg/common/Engine/DeusExMachina/Se3Interpolator.cpp
  pkg/common/Engine/DeusExMachina/StaticAttractionEngine.cpp
  pkg/common/Engine/DeusExMachina/TranslationEngine.cpp
  pkg/common/Engine/EngineUnit/CundallNonViscousDamping.cpp
  pkg/common/Engine/EngineUnit/ElasticBodySimpleRelationship.cpp
  pkg/common/Engine/EngineUnit/InteractingSphere2AABB.hpp
  pkg/common/Engine/EngineUnit/LeapFrogOrientationIntegrator.cpp
  pkg/common/Engine/EngineUnit/LeapFrogOrientationIntegrator.hpp
  pkg/common/Engine/EngineUnit/LeapFrogPositionIntegrator.cpp
  pkg/common/Engine/EngineUnit/LeapFrogPositionIntegrator.hpp
  pkg/common/Engine/EngineUnit/MetaInteractingGeometry2AABB.cpp
  pkg/common/Engine/EngineUnit/NewtonsForceLaw.cpp
  pkg/common/Engine/EngineUnit/NewtonsForceLaw.hpp
  pkg/common/Engine/EngineUnit/NewtonsMomentumLaw.cpp
  pkg/common/Engine/EngineUnit/NewtonsMomentumLaw.hpp
  pkg/common/Engine/EngineUnit/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.cpp
  pkg/common/Engine/EngineUnit/ef2_BssSweptSphereLineSegment_AABB_makeAABB.cpp
  pkg/common/Engine/MetaEngine/BoundingVolumeEngineUnit.cpp
  pkg/common/Engine/MetaEngine/BoundingVolumeEngineUnit.hpp
  pkg/common/Engine/MetaEngine/BoundingVolumeMetaEngine.cpp
  pkg/common/Engine/MetaEngine/BoundingVolumeMetaEngine.hpp
  pkg/common/Engine/MetaEngine/ConstitutiveLaw.cpp
  pkg/common/Engine/MetaEngine/GeometricalModelEngineUnit.cpp
  pkg/common/Engine/MetaEngine/GeometricalModelMetaEngine.cpp
  pkg/common/Engine/MetaEngine/InteractingGeometryEngineUnit.cpp
  pkg/common/Engine/MetaEngine/InteractingGeometryMetaEngine.cpp
  pkg/common/Engine/MetaEngine/InteractionDispatchers.cpp
  pkg/common/Engine/MetaEngine/InteractionGeometryMetaEngine.cpp
  pkg/common/Engine/MetaEngine/InteractionPhysicsEngineUnit.cpp
  pkg/common/Engine/MetaEngine/InteractionPhysicsEngineUnit.hpp
  pkg/common/Engine/MetaEngine/InteractionPhysicsMetaEngine.cpp
  pkg/common/Engine/MetaEngine/InteractionPhysicsMetaEngine.hpp
  pkg/common/Engine/MetaEngine/PhysicalActionApplier.cpp
  pkg/common/Engine/MetaEngine/PhysicalActionApplierUnit.cpp
  pkg/common/Engine/MetaEngine/PhysicalActionApplierUnit.hpp
  pkg/common/Engine/MetaEngine/PhysicalActionDamper.cpp
  pkg/common/Engine/MetaEngine/PhysicalActionDamperUnit.cpp
  pkg/common/Engine/StandAloneEngine/InsertionSortCollider.cpp
  pkg/common/Engine/StandAloneEngine/PersistentTriangulationCollider.cpp
  pkg/common/Engine/StandAloneEngine/ResetPositionEngine.cpp
  pkg/common/Engine/StandAloneEngine/ResetRandomPosition.cpp
  pkg/common/Engine/StandAloneEngine/SpatialQuickSortCollider.cpp
  pkg/common/Engine/StandAloneEngine/SpheresFactory.cpp
  pkg/common/RenderingEngine/GLDrawAABB.cpp
  pkg/common/RenderingEngine/GLDrawBox.cpp
  pkg/common/RenderingEngine/GLDrawBoxShadowVolume.cpp
  pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.cpp
  pkg/common/RenderingEngine/GLDrawFacet.cpp
  pkg/common/RenderingEngine/GLDrawFunctors.hpp
  pkg/common/RenderingEngine/GLDrawInteractingBox.cpp
  pkg/common/RenderingEngine/GLDrawInteractingBox.hpp
  pkg/common/RenderingEngine/GLDrawInteractingFacet.cpp
  pkg/common/RenderingEngine/GLDrawInteractingFacet.hpp
  pkg/common/RenderingEngine/GLDrawInteractingSphere.cpp
  pkg/common/RenderingEngine/GLDrawInteractingSphere.hpp
  pkg/common/RenderingEngine/GLDrawMetaInteractingGeometry.cpp
  pkg/common/RenderingEngine/GLDrawNormalInteraction.cpp
  pkg/common/RenderingEngine/GLDrawParticleState.cpp
  pkg/common/RenderingEngine/GLDrawQuadrilateral.cpp
  pkg/common/RenderingEngine/GLDrawRigidBodyState.cpp
  pkg/common/RenderingEngine/GLDrawSphere.cpp
  pkg/common/RenderingEngine/GLDrawSphereShadowVolume.cpp
  pkg/common/RenderingEngine/GLDrawTetrahedron.cpp
  pkg/common/RenderingEngine/GLDrawTube.cpp
  pkg/common/RenderingEngine/OpenGLRenderingEngine.cpp
  pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp
  pkg/dem/DataClass/Clump.cpp
  pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_FacetSphere.cpp
  pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_SphereSphere.cpp
  pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_WallSphere.cpp
  pkg/dem/DataClass/InteractionGeometry/DemXDofGeom.cpp
  pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.cpp
  pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.hpp
  pkg/dem/DataClass/InteractionPhysics/CapillaryParameters.cpp
  pkg/dem/DataClass/InteractionPhysics/CohesiveFrictionalContactInteraction.cpp
  pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.cpp
  pkg/dem/DataClass/InteractionPhysics/ElasticContactInteraction.cpp
  pkg/dem/DataClass/InteractionPhysics/ElasticContactInteraction.hpp
  pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.cpp
  pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp
  pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.cpp
  pkg/dem/DataClass/PhysicalParameters/CohesiveFrictionalBodyParameters.cpp
  pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.cpp
  pkg/dem/DataClass/SpherePack.cpp
  pkg/dem/Engine/DeusExMachina/CapillaryPressureEngine.cpp
  pkg/dem/Engine/DeusExMachina/CapillaryRecorder.cpp
  pkg/dem/Engine/DeusExMachina/CapillaryStressRecorder.cpp
  pkg/dem/Engine/DeusExMachina/ContactStressRecorder.cpp
  pkg/dem/Engine/DeusExMachina/FlowEngine.cpp
  pkg/dem/Engine/DeusExMachina/HydraulicForceEngine.cpp
  pkg/dem/Engine/DeusExMachina/SampleCapillaryPressureEngine.cpp
  pkg/dem/Engine/DeusExMachina/StaticSpheresAttractionEngine.cpp
  pkg/dem/Engine/DeusExMachina/ThreeDTriaxialEngine.cpp
  pkg/dem/Engine/DeusExMachina/TriaxialCompressionEngine.cpp
  pkg/dem/Engine/DeusExMachina/TriaxialStateRecorder.cpp
  pkg/dem/Engine/DeusExMachina/TriaxialStressController.cpp
  pkg/dem/Engine/DeusExMachina/TriaxialStressController.hpp
  pkg/dem/Engine/DeusExMachina/WallStressRecorder.cpp
  pkg/dem/Engine/EngineUnit/BasicViscoelasticRelationships.cpp
  pkg/dem/Engine/EngineUnit/CL1Relationships.cpp
  pkg/dem/Engine/EngineUnit/CohesiveFrictionalRelationships.cpp
  pkg/dem/Engine/EngineUnit/InteractingFacet2InteractingSphere4SpheresContactGeometry.cpp
  pkg/dem/Engine/EngineUnit/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.cpp
  pkg/dem/Engine/EngineUnit/MacroMicroElasticRelationships.cpp
  pkg/dem/Engine/EngineUnit/MacroMicroElasticRelationships.hpp
  pkg/dem/Engine/EngineUnit/SimpleElasticRelationships.cpp
  pkg/dem/Engine/EngineUnit/SimpleElasticRelationships.hpp
  pkg/dem/Engine/EngineUnit/SimpleElasticRelationshipsWater.cpp
  pkg/dem/Engine/EngineUnit/SimpleViscoelasticRelationships.cpp
  pkg/dem/Engine/EngineUnit/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.cpp
  pkg/dem/Engine/EngineUnit/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp
  pkg/dem/Engine/StandAloneEngine/AveragePositionRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/CapillaryCohesiveLaw.cpp
  pkg/dem/Engine/StandAloneEngine/CohesiveFrictionalContactLaw.cpp
  pkg/dem/Engine/StandAloneEngine/ContactLaw1.cpp
  pkg/dem/Engine/StandAloneEngine/ElasticCohesiveLaw.cpp
  pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.cpp
  pkg/dem/Engine/StandAloneEngine/ElasticCriterionTimeStepper.cpp
  pkg/dem/Engine/StandAloneEngine/FacetTopologyAnalyzer.cpp
  pkg/dem/Engine/StandAloneEngine/ForceRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/ForceSnapshot.cpp
  pkg/dem/Engine/StandAloneEngine/GeometricalModelForceColorizer.cpp
  pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.cpp
  pkg/dem/Engine/StandAloneEngine/HistoryRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/MGPRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/MicroMacroAnalyser.cpp
  pkg/dem/Engine/StandAloneEngine/NewtonsDampedLaw.cpp
  pkg/dem/Engine/StandAloneEngine/PositionOrientationRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/PositionRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/PositionSnapshot.cpp
  pkg/dem/Engine/StandAloneEngine/RigidBodyRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/UniaxialStrainer.cpp
  pkg/dem/Engine/StandAloneEngine/UniaxialStrainer.hpp
  pkg/dem/Engine/StandAloneEngine/VTKRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/VelocityRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/ViscousForceDamping.cpp
  pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.cpp
  pkg/dem/PreProcessor/ClumpTestGen.cpp
  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/STLImporter.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/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp
  pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.cpp
  pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.cpp
  pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.cpp
  pkg/dem/meta/ConcretePM.cpp
  pkg/dem/meta/ConcretePM.hpp
  pkg/dem/meta/RockPM.cpp
  pkg/dem/meta/Shop.cpp
  pkg/dem/meta/Shop.hpp
  pkg/dem/meta/Tetra.cpp
  pkg/dem/meta/Tetra.hpp
  pkg/lattice/DataClass/GeometricalModel/LatticeSetGeometry.cpp
  pkg/lattice/DataClass/GeometricalModel/LineSegment.cpp
  pkg/lattice/DataClass/InteractingGeometry/LatticeInteractingGeometry.cpp
  pkg/lattice/DataClass/InteractionPhysics/LatticeBeamAngularSpring.cpp
  pkg/lattice/DataClass/InteractionPhysics/NonLocalDependency.cpp
  pkg/lattice/DataClass/PhysicalParameters/LatticeBeamParameters.cpp
  pkg/lattice/DataClass/PhysicalParameters/LatticeNodeParameters.cpp
  pkg/lattice/DataClass/PhysicalParameters/LatticeSetParameters.cpp
  pkg/lattice/Engine/EngineUnit/LatticeSet2LatticeBeams.cpp
  pkg/lattice/Engine/StandAloneEngine/BeamRecorder.cpp
  pkg/lattice/Engine/StandAloneEngine/LatticeLaw.cpp
  pkg/lattice/Engine/StandAloneEngine/MeasurePoisson.cpp
  pkg/lattice/Engine/StandAloneEngine/MovingSupport.cpp
  pkg/lattice/Engine/StandAloneEngine/NodeRecorder.cpp
  pkg/lattice/Engine/StandAloneEngine/NonLocalInitializer.cpp
  pkg/lattice/Engine/StandAloneEngine/StrainRecorder.cpp
  pkg/lattice/PreProcessor/LatticeExample.cpp
  pkg/lattice/PreProcessor/LatticeExampleCTData.cpp
  pkg/lattice/PreProcessor/LatticeExampleSimple.cpp
  pkg/lattice/RenderingEngine/GLDrawLatticeBeamState.cpp
  pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry.cpp
  pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry.cpp
  pkg/lattice/RenderingEngine/GLDrawLineSegment.cpp
  pkg/snow/DataClass/BshSnowGrain.cpp
  pkg/snow/DataClass/BssSnowGrain.cpp
  pkg/snow/DataClass/IstSnowLayersContact.cpp
  pkg/snow/Engine/Ef2_BssSnowGrain_AABB_makeAABB.cpp
  pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact.cpp
  pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeSpheresContactGeometry.cpp
  pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp
  pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeSpheresContactGeometry.cpp
  pkg/snow/Engine/ElawSnowLayersDeformation.cpp
  pkg/snow/PreProcessor/SnowCreepTest.cpp
  pkg/snow/PreProcessor/SnowVoxelsLoader.cpp
  pkg/snow/PreProcessor/Voxel/Config.cpp
  pkg/snow/PreProcessor/Voxel/DataSurface.cpp
  pkg/snow/PreProcessor/Voxel/DataVoxel.cpp
  pkg/snow/PreProcessor/Voxel/GrainSurface.cpp
  pkg/snow/PreProcessor/Voxel/SafeVectors3.cpp
  pkg/snow/PreProcessor/Voxel/VoxelEnvelope.cpp
  pkg/snow/RenderingEngine/Ef1_BshSnowGrain_glDraw.cpp
  pkg/snow/RenderingEngine/Ef1_BssSnowGrain_glDraw.cpp
  pkg/snow/RenderingEngine/Ef1_IstSnowLayersContact_glDraw.cpp
  py/SConscript
  py/_eudoxos.cpp
  py/_utils.cpp
  py/tests/wrapper.py
  py/utils.py
  py/yadeWrapper/customConverters.cpp
  py/yadeWrapper/yadeWrapper.cpp
  scripts/simple-scene.py
  pkg/common/Engine/MetaEngine/StateEngineUnit.cpp
  pkg/common/Engine/MetaEngine/StateEngineUnit.hpp
  pkg/common/Engine/MetaEngine/StateMetaEngine.cpp
  pkg/common/Engine/MetaEngine/StateMetaEngine.hpp
The size of the diff (6419 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.