← Back to team overview

yade-dev team mailing list archive

  1. yade-dev team
  2. Mailing list archive
  3. Message #05899

[Branch ~yade-dev/yade/trunk] Rev 2485: 1. Flattening the file hierarchy, as mentioned previously. No changes to #include paths so far.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 2485
committer: Václav Šmilauer <eu@xxxxxxxx>
branch nick: yade
timestamp: Wed 2010-10-13 18:23:08 +0200
message:
  1. Flattening the file hierarchy, as mentioned previously. No changes to #include paths so far.
  2. Change the directory where to install headers to not include yade version
removed:
  extra/SpherePadder/
  extra/SpherePadder/SpherePackingTriangulation/
  pkg/common/DataClass/
  pkg/common/DataClass/Bound/
  pkg/common/DataClass/IPhys/
  pkg/common/DataClass/Material/
  pkg/common/DataClass/Shape/
  pkg/common/Engine/
  pkg/common/Engine/Callback/
  pkg/common/Engine/Dispatcher/
  pkg/common/Engine/Functor/
  pkg/common/Engine/GlobalEngine/
  pkg/common/Engine/PartialEngine/
  pkg/common/RenderingEngine/
  pkg/dem/DataClass/
  pkg/dem/DataClass/IGeom/
  pkg/dem/DataClass/IPhys/
  pkg/dem/DataClass/Material/
  pkg/dem/Engine/
  pkg/dem/Engine/Callback/
  pkg/dem/Engine/Functor/
  pkg/dem/Engine/GlobalEngine/
  pkg/dem/Engine/PartialEngine/
  pkg/dem/PreProcessor/
  pkg/dem/meta/
renamed:
  pkg/common/DataClass/Bound/Aabb.cpp => pkg/common/Aabb.cpp
  pkg/common/DataClass/Bound/Aabb.hpp => pkg/common/Aabb.hpp
  pkg/common/DataClass/IPhys/NormShearPhys.cpp => pkg/common/NormShearPhys.cpp
  pkg/common/DataClass/IPhys/NormShearPhys.hpp => pkg/common/NormShearPhys.hpp
  pkg/common/DataClass/MatchMaker.cpp => pkg/common/MatchMaker.cpp
  pkg/common/DataClass/MatchMaker.hpp => pkg/common/MatchMaker.hpp
  pkg/common/DataClass/Material/ElastMat.cpp => pkg/common/ElastMat.cpp
  pkg/common/DataClass/Material/ElastMat.hpp => pkg/common/ElastMat.hpp
  pkg/common/DataClass/Shape/Box.cpp => pkg/common/Box.cpp
  pkg/common/DataClass/Shape/Box.hpp => pkg/common/Box.hpp
  pkg/common/DataClass/Shape/Cylinder.cpp => pkg/common/Cylinder.cpp
  pkg/common/DataClass/Shape/Cylinder.hpp => pkg/common/Cylinder.hpp
  pkg/common/DataClass/Shape/Facet.cpp => pkg/common/Facet.cpp
  pkg/common/DataClass/Shape/Facet.hpp => pkg/common/Facet.hpp
  pkg/common/DataClass/Shape/Sphere.cpp => pkg/common/Sphere.cpp
  pkg/common/DataClass/Shape/Sphere.hpp => pkg/common/Sphere.hpp
  pkg/common/DataClass/Shape/Wall.cpp => pkg/common/Wall.cpp
  pkg/common/DataClass/Shape/Wall.hpp => pkg/common/Wall.hpp
  pkg/common/DataClass/VelocityBins.cpp => pkg/common/VelocityBins.cpp
  pkg/common/DataClass/VelocityBins.hpp => pkg/common/VelocityBins.hpp
  pkg/common/Engine/Callback/Callbacks.cpp => pkg/common/Callbacks.cpp
  pkg/common/Engine/Callback/Callbacks.hpp => pkg/common/Callbacks.hpp
  pkg/common/Engine/Dispatcher/Dispatching.cpp => pkg/common/Dispatching.cpp
  pkg/common/Engine/Dispatcher/Dispatching.hpp => pkg/common/Dispatching.hpp
  pkg/common/Engine/Dispatcher/InteractionLoop.cpp => pkg/common/InteractionLoop.cpp
  pkg/common/Engine/Dispatcher/InteractionLoop.hpp => pkg/common/InteractionLoop.hpp
  pkg/common/Engine/Functor/Bo1_Box_Aabb.cpp => pkg/common/Bo1_Box_Aabb.cpp
  pkg/common/Engine/Functor/Bo1_Box_Aabb.hpp => pkg/common/Bo1_Box_Aabb.hpp
  pkg/common/Engine/Functor/Bo1_Facet_Aabb.cpp => pkg/common/Bo1_Facet_Aabb.cpp
  pkg/common/Engine/Functor/Bo1_Facet_Aabb.hpp => pkg/common/Bo1_Facet_Aabb.hpp
  pkg/common/Engine/Functor/Bo1_Sphere_Aabb.cpp => pkg/common/Bo1_Sphere_Aabb.cpp
  pkg/common/Engine/Functor/Bo1_Sphere_Aabb.hpp => pkg/common/Bo1_Sphere_Aabb.hpp
  pkg/common/Engine/GlobalEngine/BoundaryController.cpp => pkg/common/BoundaryController.cpp
  pkg/common/Engine/GlobalEngine/BoundaryController.hpp => pkg/common/BoundaryController.hpp
  pkg/common/Engine/GlobalEngine/Collider.cpp => pkg/common/Collider.cpp
  pkg/common/Engine/GlobalEngine/Collider.hpp => pkg/common/Collider.hpp
  pkg/common/Engine/GlobalEngine/FieldApplier.cpp => pkg/common/FieldApplier.cpp
  pkg/common/Engine/GlobalEngine/FieldApplier.hpp => pkg/common/FieldApplier.hpp
  pkg/common/Engine/GlobalEngine/ForceResetter.cpp => pkg/common/ForceResetter.cpp
  pkg/common/Engine/GlobalEngine/ForceResetter.hpp => pkg/common/ForceResetter.hpp
  pkg/common/Engine/GlobalEngine/InsertionSortCollider.cpp => pkg/common/InsertionSortCollider.cpp
  pkg/common/Engine/GlobalEngine/InsertionSortCollider.hpp => pkg/common/InsertionSortCollider.hpp
  pkg/common/Engine/GlobalEngine/PeriodicEngines.cpp => pkg/common/PeriodicEngines.cpp
  pkg/common/Engine/GlobalEngine/PeriodicEngines.hpp => pkg/common/PeriodicEngines.hpp
  pkg/common/Engine/GlobalEngine/PersistentTriangulationCollider.cpp => pkg/common/PersistentTriangulationCollider.cpp
  pkg/common/Engine/GlobalEngine/PersistentTriangulationCollider.hpp => pkg/common/PersistentTriangulationCollider.hpp
  pkg/common/Engine/GlobalEngine/PyRunner.cpp => pkg/common/PyRunner.cpp
  pkg/common/Engine/GlobalEngine/PyRunner.hpp => pkg/common/PyRunner.hpp
  pkg/common/Engine/GlobalEngine/Recorder.cpp => pkg/common/Recorder.cpp
  pkg/common/Engine/GlobalEngine/Recorder.hpp => pkg/common/Recorder.hpp
  pkg/common/Engine/GlobalEngine/ResetRandomPosition.cpp => pkg/common/ResetRandomPosition.cpp
  pkg/common/Engine/GlobalEngine/ResetRandomPosition.hpp => pkg/common/ResetRandomPosition.hpp
  pkg/common/Engine/GlobalEngine/SpatialQuickSortCollider.cpp => pkg/common/SpatialQuickSortCollider.cpp
  pkg/common/Engine/GlobalEngine/SpatialQuickSortCollider.hpp => pkg/common/SpatialQuickSortCollider.hpp
  pkg/common/Engine/GlobalEngine/SpheresFactory.cpp => pkg/common/SpheresFactory.cpp
  pkg/common/Engine/GlobalEngine/SpheresFactory.hpp => pkg/common/SpheresFactory.hpp
  pkg/common/Engine/ParallelEngine.cpp => pkg/common/ParallelEngine.cpp
  pkg/common/Engine/ParallelEngine.hpp => pkg/common/ParallelEngine.hpp
  pkg/common/Engine/PartialEngine/ForceEngine.cpp => pkg/common/ForceEngine.cpp
  pkg/common/Engine/PartialEngine/ForceEngine.hpp => pkg/common/ForceEngine.hpp
  pkg/common/Engine/PartialEngine/GravityEngines.cpp => pkg/common/GravityEngines.cpp
  pkg/common/Engine/PartialEngine/GravityEngines.hpp => pkg/common/GravityEngines.hpp
  pkg/common/Engine/PartialEngine/LinearInterpolate.hpp => pkg/common/LinearInterpolate.hpp
  pkg/common/Engine/PartialEngine/PressTestEngine.cpp => pkg/common/PressTestEngine.cpp
  pkg/common/Engine/PartialEngine/PressTestEngine.hpp => pkg/common/PressTestEngine.hpp
  pkg/common/Engine/PartialEngine/RotationEngine.cpp => pkg/common/RotationEngine.cpp
  pkg/common/Engine/PartialEngine/RotationEngine.hpp => pkg/common/RotationEngine.hpp
  pkg/common/Engine/PartialEngine/StepDisplacer.cpp => pkg/common/StepDisplacer.cpp
  pkg/common/Engine/PartialEngine/StepDisplacer.hpp => pkg/common/StepDisplacer.hpp
  pkg/common/Engine/PartialEngine/TorqueEngine.cpp => pkg/common/TorqueEngine.cpp
  pkg/common/Engine/PartialEngine/TorqueEngine.hpp => pkg/common/TorqueEngine.hpp
  pkg/common/Engine/PartialEngine/TranslationEngine.cpp => pkg/common/TranslationEngine.cpp
  pkg/common/Engine/PartialEngine/TranslationEngine.hpp => pkg/common/TranslationEngine.hpp
  pkg/common/RenderingEngine/GLDrawFunctors.cpp => pkg/common/GLDrawFunctors.cpp
  pkg/common/RenderingEngine/GLDrawFunctors.hpp => pkg/common/GLDrawFunctors.hpp
  pkg/common/RenderingEngine/Gl1_Aabb.cpp => pkg/common/Gl1_Aabb.cpp
  pkg/common/RenderingEngine/Gl1_Aabb.hpp => pkg/common/Gl1_Aabb.hpp
  pkg/common/RenderingEngine/Gl1_Box.cpp => pkg/common/Gl1_Box.cpp
  pkg/common/RenderingEngine/Gl1_Box.hpp => pkg/common/Gl1_Box.hpp
  pkg/common/RenderingEngine/Gl1_Facet.cpp => pkg/common/Gl1_Facet.cpp
  pkg/common/RenderingEngine/Gl1_Facet.hpp => pkg/common/Gl1_Facet.hpp
  pkg/common/RenderingEngine/Gl1_NormPhys.cpp => pkg/common/Gl1_NormPhys.cpp
  pkg/common/RenderingEngine/Gl1_NormPhys.hpp => pkg/common/Gl1_NormPhys.hpp
  pkg/common/RenderingEngine/Gl1_Sphere.cpp => pkg/common/Gl1_Sphere.cpp
  pkg/common/RenderingEngine/Gl1_Sphere.hpp => pkg/common/Gl1_Sphere.hpp
  pkg/common/RenderingEngine/OpenGLRenderer.cpp => pkg/common/OpenGLRenderer.cpp
  pkg/common/RenderingEngine/OpenGLRenderer.hpp => pkg/common/OpenGLRenderer.hpp
  pkg/dem/DataClass/Clump.cpp => pkg/dem/Clump.cpp
  pkg/dem/DataClass/Clump.hpp => pkg/dem/Clump.hpp
  pkg/dem/DataClass/IGeom/Dem3DofGeom_FacetSphere.cpp => pkg/dem/Dem3DofGeom_FacetSphere.cpp
  pkg/dem/DataClass/IGeom/Dem3DofGeom_FacetSphere.hpp => pkg/dem/Dem3DofGeom_FacetSphere.hpp
  pkg/dem/DataClass/IGeom/Dem3DofGeom_SphereSphere.cpp => pkg/dem/Dem3DofGeom_SphereSphere.cpp
  pkg/dem/DataClass/IGeom/Dem3DofGeom_SphereSphere.hpp => pkg/dem/Dem3DofGeom_SphereSphere.hpp
  pkg/dem/DataClass/IGeom/Dem3DofGeom_WallSphere.cpp => pkg/dem/Dem3DofGeom_WallSphere.cpp
  pkg/dem/DataClass/IGeom/Dem3DofGeom_WallSphere.hpp => pkg/dem/Dem3DofGeom_WallSphere.hpp
  pkg/dem/DataClass/IGeom/DemXDofGeom.cpp => pkg/dem/DemXDofGeom.cpp
  pkg/dem/DataClass/IGeom/DemXDofGeom.hpp => pkg/dem/DemXDofGeom.hpp
  pkg/dem/DataClass/IGeom/ScGeom.cpp => pkg/dem/ScGeom.cpp
  pkg/dem/DataClass/IGeom/ScGeom.hpp => pkg/dem/ScGeom.hpp
  pkg/dem/DataClass/IPhys/CapillaryPhys.cpp => pkg/dem/CapillaryPhys.cpp
  pkg/dem/DataClass/IPhys/CapillaryPhys.hpp => pkg/dem/CapillaryPhys.hpp
  pkg/dem/DataClass/IPhys/CohFrictPhys.cpp => pkg/dem/CohFrictPhys.cpp
  pkg/dem/DataClass/IPhys/CohFrictPhys.hpp => pkg/dem/CohFrictPhys.hpp
  pkg/dem/DataClass/IPhys/FrictPhys.cpp => pkg/dem/FrictPhys.cpp
  pkg/dem/DataClass/IPhys/FrictPhys.hpp => pkg/dem/FrictPhys.hpp
  pkg/dem/DataClass/IPhys/NormalInelasticityPhys.cpp => pkg/dem/NormalInelasticityPhys.cpp
  pkg/dem/DataClass/IPhys/NormalInelasticityPhys.hpp => pkg/dem/NormalInelasticityPhys.hpp
  pkg/dem/DataClass/Material/CohFrictMat.cpp => pkg/dem/CohFrictMat.cpp
  pkg/dem/DataClass/Material/CohFrictMat.hpp => pkg/dem/CohFrictMat.hpp
  pkg/dem/DataClass/Material/NormalInelasticMat.cpp => pkg/dem/NormalInelasticMat.cpp
  pkg/dem/DataClass/Material/NormalInelasticMat.hpp => pkg/dem/NormalInelasticMat.hpp
  pkg/dem/DataClass/SpherePack.cpp => pkg/dem/SpherePack.cpp
  pkg/dem/DataClass/SpherePack.hpp => pkg/dem/SpherePack.hpp
  pkg/dem/Engine/Callback/UnbalancedForceCallbacks.cpp => pkg/dem/UnbalancedForceCallbacks.cpp
  pkg/dem/Engine/Callback/UnbalancedForceCallbacks.hpp => pkg/dem/UnbalancedForceCallbacks.hpp
  pkg/dem/Engine/Functor/Ig2_Box_Sphere_ScGeom.cpp => pkg/dem/Ig2_Box_Sphere_ScGeom.cpp
  pkg/dem/Engine/Functor/Ig2_Box_Sphere_ScGeom.hpp => pkg/dem/Ig2_Box_Sphere_ScGeom.hpp
  pkg/dem/Engine/Functor/Ig2_Facet_Sphere_ScGeom.cpp => pkg/dem/Ig2_Facet_Sphere_ScGeom.cpp
  pkg/dem/Engine/Functor/Ig2_Facet_Sphere_ScGeom.hpp => pkg/dem/Ig2_Facet_Sphere_ScGeom.hpp
  pkg/dem/Engine/Functor/Ig2_Sphere_Sphere_ScGeom.cpp => pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp
  pkg/dem/Engine/Functor/Ig2_Sphere_Sphere_ScGeom.hpp => pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp
  pkg/dem/Engine/Functor/Ip2_2xCohFrictMat_CohFrictPhys.cpp => pkg/dem/Ip2_2xCohFrictMat_CohFrictPhys.cpp
  pkg/dem/Engine/Functor/Ip2_2xCohFrictMat_CohFrictPhys.hpp => pkg/dem/Ip2_2xCohFrictMat_CohFrictPhys.hpp
  pkg/dem/Engine/Functor/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.cpp => pkg/dem/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.cpp
  pkg/dem/Engine/Functor/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.hpp => pkg/dem/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.hpp
  pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_CapillaryPhys.cpp => pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.cpp
  pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp => pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp
  pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_FrictPhys.cpp => pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.cpp
  pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_FrictPhys.hpp => pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp
  pkg/dem/Engine/Functor/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.cpp => pkg/dem/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.cpp
  pkg/dem/Engine/Functor/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.hpp => pkg/dem/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.hpp
  pkg/dem/Engine/Functor/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp => pkg/dem/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp
  pkg/dem/Engine/Functor/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.hpp => pkg/dem/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.hpp
  pkg/dem/Engine/GlobalEngine/CohesionlessMomentRotation.cpp => pkg/dem/CohesionlessMomentRotation.cpp
  pkg/dem/Engine/GlobalEngine/CohesionlessMomentRotation.hpp => pkg/dem/CohesionlessMomentRotation.hpp
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp => pkg/dem/CohesiveFrictionalContactLaw.cpp
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.hpp => pkg/dem/CohesiveFrictionalContactLaw.hpp
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalPM.cpp => pkg/dem/CohesiveFrictionalPM.cpp
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalPM.hpp => pkg/dem/CohesiveFrictionalPM.hpp
  pkg/dem/Engine/GlobalEngine/CohesiveStateRPMRecorder.cpp => pkg/dem/CohesiveStateRPMRecorder.cpp
  pkg/dem/Engine/GlobalEngine/CohesiveStateRPMRecorder.hpp => pkg/dem/CohesiveStateRPMRecorder.hpp
  pkg/dem/Engine/GlobalEngine/CundallStrack.cpp => pkg/dem/CundallStrack.cpp
  pkg/dem/Engine/GlobalEngine/CundallStrack.hpp => pkg/dem/CundallStrack.hpp
  pkg/dem/Engine/GlobalEngine/DomainLimiter.cpp => pkg/dem/DomainLimiter.cpp
  pkg/dem/Engine/GlobalEngine/DomainLimiter.hpp => pkg/dem/DomainLimiter.hpp
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp => pkg/dem/ElasticContactLaw.cpp
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp => pkg/dem/ElasticContactLaw.hpp
  pkg/dem/Engine/GlobalEngine/FacetTopologyAnalyzer.cpp => pkg/dem/FacetTopologyAnalyzer.cpp
  pkg/dem/Engine/GlobalEngine/FacetTopologyAnalyzer.hpp => pkg/dem/FacetTopologyAnalyzer.hpp
  pkg/dem/Engine/GlobalEngine/FlatGridCollider.cpp => pkg/dem/FlatGridCollider.cpp
  pkg/dem/Engine/GlobalEngine/FlatGridCollider.hpp => pkg/dem/FlatGridCollider.hpp
  pkg/dem/Engine/GlobalEngine/ForceRecorder.cpp => pkg/dem/ForceRecorder.cpp
  pkg/dem/Engine/GlobalEngine/ForceRecorder.hpp => pkg/dem/ForceRecorder.hpp
  pkg/dem/Engine/GlobalEngine/GlobalStiffnessTimeStepper.cpp => pkg/dem/GlobalStiffnessTimeStepper.cpp
  pkg/dem/Engine/GlobalEngine/GlobalStiffnessTimeStepper.hpp => pkg/dem/GlobalStiffnessTimeStepper.hpp
  pkg/dem/Engine/GlobalEngine/HertzMindlin.cpp => pkg/dem/HertzMindlin.cpp
  pkg/dem/Engine/GlobalEngine/HertzMindlin.hpp => pkg/dem/HertzMindlin.hpp
  pkg/dem/Engine/GlobalEngine/Law2_ScGeom_CapillaryPhys_Capillarity.cpp => pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
  pkg/dem/Engine/GlobalEngine/Law2_ScGeom_CapillaryPhys_Capillarity.hpp => pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp
  pkg/dem/Engine/GlobalEngine/MicroMacroAnalyser.cpp => pkg/dem/MicroMacroAnalyser.cpp
  pkg/dem/Engine/GlobalEngine/MicroMacroAnalyser.hpp => pkg/dem/MicroMacroAnalyser.hpp
  pkg/dem/Engine/GlobalEngine/NewtonIntegrator.cpp => pkg/dem/NewtonIntegrator.cpp
  pkg/dem/Engine/GlobalEngine/NewtonIntegrator.hpp => pkg/dem/NewtonIntegrator.hpp
  pkg/dem/Engine/GlobalEngine/NormalInelasticityLaw.cpp => pkg/dem/NormalInelasticityLaw.cpp
  pkg/dem/Engine/GlobalEngine/NormalInelasticityLaw.hpp => pkg/dem/NormalInelasticityLaw.hpp
  pkg/dem/Engine/GlobalEngine/NozzleFactory.cpp => pkg/dem/NozzleFactory.cpp
  pkg/dem/Engine/GlobalEngine/NozzleFactory.hpp => pkg/dem/NozzleFactory.hpp
  pkg/dem/Engine/GlobalEngine/ParticleSizeDistrbutionRPMRecorder.cpp => pkg/dem/ParticleSizeDistrbutionRPMRecorder.cpp
  pkg/dem/Engine/GlobalEngine/ParticleSizeDistrbutionRPMRecorder.hpp => pkg/dem/ParticleSizeDistrbutionRPMRecorder.hpp
  pkg/dem/Engine/GlobalEngine/PeriIsoCompressor.cpp => pkg/dem/PeriIsoCompressor.cpp
  pkg/dem/Engine/GlobalEngine/PeriIsoCompressor.hpp => pkg/dem/PeriIsoCompressor.hpp
  pkg/dem/Engine/GlobalEngine/TesselationWrapper.cpp => pkg/dem/TesselationWrapper.cpp
  pkg/dem/Engine/GlobalEngine/TesselationWrapper.hpp => pkg/dem/TesselationWrapper.hpp
  pkg/dem/Engine/GlobalEngine/UniaxialStrainer.cpp => pkg/dem/UniaxialStrainer.cpp
  pkg/dem/Engine/GlobalEngine/UniaxialStrainer.hpp => pkg/dem/UniaxialStrainer.hpp
  pkg/dem/Engine/GlobalEngine/VTKRecorder.cpp => pkg/dem/VTKRecorder.cpp
  pkg/dem/Engine/GlobalEngine/VTKRecorder.hpp => pkg/dem/VTKRecorder.hpp
  pkg/dem/Engine/PartialEngine/CapillaryPressureEngine.cpp => pkg/dem/CapillaryPressureEngine.cpp
  pkg/dem/Engine/PartialEngine/CapillaryPressureEngine.hpp => pkg/dem/CapillaryPressureEngine.hpp
  pkg/dem/Engine/PartialEngine/CapillaryStressRecorder.cpp => pkg/dem/CapillaryStressRecorder.cpp
  pkg/dem/Engine/PartialEngine/CapillaryStressRecorder.hpp => pkg/dem/CapillaryStressRecorder.hpp
  pkg/dem/Engine/PartialEngine/Disp2DPropLoadEngine.cpp => pkg/dem/Disp2DPropLoadEngine.cpp
  pkg/dem/Engine/PartialEngine/Disp2DPropLoadEngine.hpp => pkg/dem/Disp2DPropLoadEngine.hpp
  pkg/dem/Engine/PartialEngine/FlowEngine.cpp => pkg/dem/FlowEngine.cpp
  pkg/dem/Engine/PartialEngine/FlowEngine.hpp => pkg/dem/FlowEngine.hpp
  pkg/dem/Engine/PartialEngine/KinemCNDEngine.cpp => pkg/dem/KinemCNDEngine.cpp
  pkg/dem/Engine/PartialEngine/KinemCNDEngine.hpp => pkg/dem/KinemCNDEngine.hpp
  pkg/dem/Engine/PartialEngine/KinemCNLEngine.cpp => pkg/dem/KinemCNLEngine.cpp
  pkg/dem/Engine/PartialEngine/KinemCNLEngine.hpp => pkg/dem/KinemCNLEngine.hpp
  pkg/dem/Engine/PartialEngine/KinemCNSEngine.cpp => pkg/dem/KinemCNSEngine.cpp
  pkg/dem/Engine/PartialEngine/KinemCNSEngine.hpp => pkg/dem/KinemCNSEngine.hpp
  pkg/dem/Engine/PartialEngine/KinemCTDEngine.cpp => pkg/dem/KinemCTDEngine.cpp
  pkg/dem/Engine/PartialEngine/KinemCTDEngine.hpp => pkg/dem/KinemCTDEngine.hpp
  pkg/dem/Engine/PartialEngine/KinemSimpleShearBox.cpp => pkg/dem/KinemSimpleShearBox.cpp
  pkg/dem/Engine/PartialEngine/KinemSimpleShearBox.hpp => pkg/dem/KinemSimpleShearBox.hpp
  pkg/dem/Engine/PartialEngine/SampleCapillaryPressureEngine.cpp => pkg/dem/SampleCapillaryPressureEngine.cpp
  pkg/dem/Engine/PartialEngine/SampleCapillaryPressureEngine.hpp => pkg/dem/SampleCapillaryPressureEngine.hpp
  pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.cpp => pkg/dem/ThreeDTriaxialEngine.cpp*
  pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.hpp => pkg/dem/ThreeDTriaxialEngine.hpp*
  pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp => pkg/dem/TriaxialCompressionEngine.cpp
  pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.hpp => pkg/dem/TriaxialCompressionEngine.hpp
  pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp => pkg/dem/TriaxialStateRecorder.cpp
  pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.hpp => pkg/dem/TriaxialStateRecorder.hpp
  pkg/dem/Engine/PartialEngine/TriaxialStressController.cpp => pkg/dem/TriaxialStressController.cpp
  pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp => pkg/dem/TriaxialStressController.hpp
  pkg/dem/PreProcessor/CapillaryTriaxialTest.cpp => pkg/dem/CapillaryTriaxialTest.cpp
  pkg/dem/PreProcessor/CapillaryTriaxialTest.hpp => pkg/dem/CapillaryTriaxialTest.hpp
  pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp => pkg/dem/CohesiveTriaxialTest.cpp
  pkg/dem/PreProcessor/CohesiveTriaxialTest.hpp => pkg/dem/CohesiveTriaxialTest.hpp
  pkg/dem/PreProcessor/STLImporter.cpp => pkg/dem/STLImporter.cpp
  pkg/dem/PreProcessor/STLImporter.hpp => pkg/dem/STLImporter.hpp
  pkg/dem/PreProcessor/STLImporterTest.cpp => pkg/dem/STLImporterTest.cpp
  pkg/dem/PreProcessor/STLImporterTest.hpp => pkg/dem/STLImporterTest.hpp
  pkg/dem/PreProcessor/SimpleShear.cpp => pkg/dem/SimpleShear.cpp
  pkg/dem/PreProcessor/SimpleShear.hpp => pkg/dem/SimpleShear.hpp
  pkg/dem/PreProcessor/TriaxialTest.cpp => pkg/dem/TriaxialTest.cpp
  pkg/dem/PreProcessor/TriaxialTest.hpp => pkg/dem/TriaxialTest.hpp
  pkg/dem/meta/ConcretePM.cpp => pkg/dem/ConcretePM.cpp
  pkg/dem/meta/ConcretePM.hpp => pkg/dem/ConcretePM.hpp
  pkg/dem/meta/RockPM.cpp => pkg/dem/RockPM.cpp
  pkg/dem/meta/RockPM.hpp => pkg/dem/RockPM.hpp
  pkg/dem/meta/Shop.cpp => pkg/dem/Shop.cpp
  pkg/dem/meta/Shop.hpp => pkg/dem/Shop.hpp
  pkg/dem/meta/Tetra.cpp => pkg/dem/Tetra.cpp
  pkg/dem/meta/Tetra.hpp => pkg/dem/Tetra.hpp
  pkg/dem/meta/ViscoelasticPM.cpp => pkg/dem/ViscoelasticPM.cpp
  pkg/dem/meta/ViscoelasticPM.hpp => pkg/dem/ViscoelasticPM.hpp
modified:
  SConstruct
  lib/triangulation/Network.cpp*
  lib/triangulation/Network.h*
  pkg/dem/DomainLimiter.cpp
  pkg/dem/DomainLimiter.hpp
  pkg/dem/ThreeDTriaxialEngine.cpp*
  pkg/dem/ThreeDTriaxialEngine.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 'SConstruct'
--- SConstruct	2010-10-13 14:03:59 +0000
+++ SConstruct	2010-10-13 16:23:08 +0000
@@ -196,7 +196,7 @@
 print "All intermediary files will be in `%s'."%env.subst(buildDir)
 env['buildDir']=buildDir
 # these MUST be first so that builddir's headers are read before any locally installed ones
-buildInc='$buildDir/include/yade-$version'
+buildInc='$buildDir/include'
 env.Append(CPPPATH=[buildInc])
 
 env.SConsignFile(buildDir+'/scons-signatures')
@@ -478,15 +478,8 @@
 ### LINKER
 ## libs for all plugins
 env.Append(LIBS=[],SHLINKFLAGS=['-rdynamic'])
-
-# if this is not present, vtables & typeinfos for classes in yade binary itself would not be exported, plugins wouldn't work
-if env['PLATFORM']=='darwin': 
-	print 'darwin platform'
-	#env.Append(LINKFLAGS=['-Z']) # ?? FIXME
-	env.Append(FRAMEWORKS=['CoreServices','Carbon'])
-else:
-	env.Append(LINKFLAGS=['-rdynamic','-Wl,-z,origin']) 
-	if not env['debug']: env.Append(SHLINKFLAGS=['-W,--strip-all'])
+env.Append(LINKFLAGS=['-rdynamic','-Wl,-z,origin']) 
+if not env['debug']: env.Append(SHLINKFLAGS=['-W,--strip-all'])
 
 # makes dynamic library loading easier (no LD_LIBRARY_PATH) and perhaps faster
 env.Append(RPATH=runtimeLibDirs)
@@ -494,48 +487,6 @@
 env.Append(LIBPATH=instLibDirs) # this is if we link to libs that are installed, which is the case now
 
 
-def installHeaders(prefix=None):
-	"""symlink all in-tree headers into  some include directory so that we can build before headers are installed.
-	If prefix is given, headers will be copied there.
-	If not, include tree will be created and syumlinked in buildDir, using relative symlinks."""
-	global env
-	import os,string,re
-	from os.path import join,split,isabs,isdir,exists,lexists,islink,isfile,sep
-	if not prefix: yadeRoot=buildDir
-	else: yadeRoot=prefix
-	yadeInc=join(yadeRoot,'include','yade-%s'%env['version'],'yade')
-
-	paths = ['.']
-	for root, dirs, files in os.walk('.'):
-		for dir in dirs:
-			if os.path.islink(os.path.join(root,dir)):
-				paths.append(os.path.join(root,dir))
-	for path in paths:
-		for root, dirs, files in os.walk(path,topdown=True):
-			for d in ('.svn'): ## skip all files that are not part of sources in the proper sense!
-				try: dirs.remove(d)
-				except ValueError: pass
-			# exclude non-lib directories (like doc, scripts, ...)
-			if not re.match(r'\.[/\\](core|lib|pkg|gui|extra)[/\\]?.*',root): continue
-			if 'noSymlinkHeaders' in root: continue
-			# exclude headers from excluded stuff
-			if re.match(r'^.*/('+'|'.join(env['exclude'])+')/',root): continue
-			for f in files:
-				if f.split('.')[-1] in ('hpp','inl','ipp','tpp','h','mcr'):
-					m=re.match('^.*?'+sep+'((extra|core)|((gui|lib|pkg)'+sep+'.*?))(|'+sep+'.*)$',root)
-					if not m:
-						print "WARNING: file %s skipped while scanning for headers (no module)"%(root+'/'+f)
-						continue
-					subInc=join(yadeInc,m.group(1).replace(sep,'-')) # replace pkg/lattice by pkg-lattice
-					if not prefix: # local include directory: do symlinks
-						if not isdir(subInc): os.makedirs(subInc)
-						linkName=join(subInc,f); linkTarget=relpath(linkName,join(root,f))
-						if not exists(linkName):
-							if lexists(linkName): os.remove(linkName) # broken symlink: remove it
-							os.symlink(linkTarget,linkName)
-					else: # install directory: use scons' Install facility
-						env.Install(subInc,join(root,f))
-
 def relpath(pf,pt):
 	"""Returns relative path from pf (path from) to pt (path to) as string.
 	Last component of pf MUST be filename, not directory name. It can be empty, though. Legal pf's: 'dir1/dir2/something.cc', 'dir1/dir2/'. Illegal: 'dir1/dir2'."""
@@ -553,10 +504,19 @@
 	# how to make that executed automatically??! For now, run always.
 	#env.AddPreAction(installAlias,installHeaders)
 	from os.path import join,split,isabs,isdir,exists,lexists,islink,isfile,sep
-	installHeaders() # install to buildDir always
-	if 0: # do not install headers
-		installHeaders(env.subst('$PREFIX')) # install to $PREFIX if specifically requested: like "scons /usr/local/include"
-	boostDir=buildDir+'/include/yade-'+env['version']+'/boost'
+	#installHeaders() # install to buildDir always
+	#if 0: # do not install headers
+	#	installHeaders(env.subst('$PREFIX')) # install to $PREFIX if specifically requested: like "scons /usr/local/include"
+
+	yadeInc=join(buildDir,'include/yade')
+	if not os.path.exists(yadeInc): os.makedirs(yadeInc)
+	import glob
+	for p in ['core','extra']+glob.glob('lib/*')+glob.glob('pkg/*')+glob.glob('gui'):
+		link=yadeInc+'/'+p.replace('/','-')
+		if os.path.isdir(p) and not os.path.exists(link):
+			if lexists(link): os.remove(link) # dangling symlink
+			os.symlink(relpath(link,p),link)
+	boostDir=buildDir+'/include/boost'
 	if not exists(boostDir): os.makedirs(boostDir)
 	def mkSymlink(link,target):
 		if not exists(link):
@@ -565,13 +525,10 @@
 	if not env['haveForeach']:
 		mkSymlink(boostDir+'/foreach.hpp','extra/foreach.hpp_local')
 	#mkSymlink(boostDir+'/python','py/3rd-party/boost-python-indexing-suite-v2-noSymlinkHeaders')
-	if os.path.exists(boostDir+'/python'): os.remove(boostDir+'/python') # remove deprecated symlink from previous line that can break things if it is left there; remove this at some point in the future
-	mkSymlink(buildDir+'/include/yade-'+env['version']+'/indexing_suite','py/3rd-party/boost-python-indexing-suite-v2-noSymlinkHeaders')
+	mkSymlink(buildDir+'/include/indexing_suite','py/3rd-party/boost-python-indexing-suite-v2-noSymlinkHeaders')
 	mkSymlink(boostDir+'/math','extra/floating_point_utilities_v3/boost/math')
-	#env.InstallAs(env['PREFIX']+'/include/yade-'+env['version']+'/boost/foreach.hpp',foreachTarget)
 	env.Default(env.Alias('install',['$PREFIX/bin','$PREFIX/lib'])) # build and install everything that should go to instDirs, which are $PREFIX/{bin,lib} (uses scons' Install)
 
-
 env.Export('env');
 
 ######

=== removed directory 'extra/SpherePadder'
=== removed directory 'extra/SpherePadder/SpherePackingTriangulation'
=== modified file 'lib/triangulation/Network.cpp' (properties changed: +x to -x)
=== modified file 'lib/triangulation/Network.h' (properties changed: +x to -x)
=== renamed file 'pkg/common/DataClass/Bound/Aabb.cpp' => 'pkg/common/Aabb.cpp'
=== renamed file 'pkg/common/DataClass/Bound/Aabb.hpp' => 'pkg/common/Aabb.hpp'
=== renamed file 'pkg/common/Engine/Functor/Bo1_Box_Aabb.cpp' => 'pkg/common/Bo1_Box_Aabb.cpp'
=== renamed file 'pkg/common/Engine/Functor/Bo1_Box_Aabb.hpp' => 'pkg/common/Bo1_Box_Aabb.hpp'
=== renamed file 'pkg/common/Engine/Functor/Bo1_Facet_Aabb.cpp' => 'pkg/common/Bo1_Facet_Aabb.cpp'
=== renamed file 'pkg/common/Engine/Functor/Bo1_Facet_Aabb.hpp' => 'pkg/common/Bo1_Facet_Aabb.hpp'
=== renamed file 'pkg/common/Engine/Functor/Bo1_Sphere_Aabb.cpp' => 'pkg/common/Bo1_Sphere_Aabb.cpp'
=== renamed file 'pkg/common/Engine/Functor/Bo1_Sphere_Aabb.hpp' => 'pkg/common/Bo1_Sphere_Aabb.hpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/BoundaryController.cpp' => 'pkg/common/BoundaryController.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/BoundaryController.hpp' => 'pkg/common/BoundaryController.hpp'
=== renamed file 'pkg/common/DataClass/Shape/Box.cpp' => 'pkg/common/Box.cpp'
=== renamed file 'pkg/common/DataClass/Shape/Box.hpp' => 'pkg/common/Box.hpp'
=== renamed file 'pkg/common/Engine/Callback/Callbacks.cpp' => 'pkg/common/Callbacks.cpp'
=== renamed file 'pkg/common/Engine/Callback/Callbacks.hpp' => 'pkg/common/Callbacks.hpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/Collider.cpp' => 'pkg/common/Collider.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/Collider.hpp' => 'pkg/common/Collider.hpp'
=== renamed file 'pkg/common/DataClass/Shape/Cylinder.cpp' => 'pkg/common/Cylinder.cpp'
=== renamed file 'pkg/common/DataClass/Shape/Cylinder.hpp' => 'pkg/common/Cylinder.hpp'
=== removed directory 'pkg/common/DataClass'
=== removed directory 'pkg/common/DataClass/Bound'
=== removed directory 'pkg/common/DataClass/IPhys'
=== removed directory 'pkg/common/DataClass/Material'
=== removed directory 'pkg/common/DataClass/Shape'
=== renamed file 'pkg/common/Engine/Dispatcher/Dispatching.cpp' => 'pkg/common/Dispatching.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/Dispatching.hpp' => 'pkg/common/Dispatching.hpp'
=== renamed file 'pkg/common/DataClass/Material/ElastMat.cpp' => 'pkg/common/ElastMat.cpp'
=== renamed file 'pkg/common/DataClass/Material/ElastMat.hpp' => 'pkg/common/ElastMat.hpp'
=== removed directory 'pkg/common/Engine'
=== removed directory 'pkg/common/Engine/Callback'
=== removed directory 'pkg/common/Engine/Dispatcher'
=== removed directory 'pkg/common/Engine/Functor'
=== removed directory 'pkg/common/Engine/GlobalEngine'
=== removed directory 'pkg/common/Engine/PartialEngine'
=== renamed file 'pkg/common/DataClass/Shape/Facet.cpp' => 'pkg/common/Facet.cpp'
=== renamed file 'pkg/common/DataClass/Shape/Facet.hpp' => 'pkg/common/Facet.hpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/FieldApplier.cpp' => 'pkg/common/FieldApplier.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/FieldApplier.hpp' => 'pkg/common/FieldApplier.hpp'
=== renamed file 'pkg/common/Engine/PartialEngine/ForceEngine.cpp' => 'pkg/common/ForceEngine.cpp'
=== renamed file 'pkg/common/Engine/PartialEngine/ForceEngine.hpp' => 'pkg/common/ForceEngine.hpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/ForceResetter.cpp' => 'pkg/common/ForceResetter.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/ForceResetter.hpp' => 'pkg/common/ForceResetter.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawFunctors.cpp' => 'pkg/common/GLDrawFunctors.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawFunctors.hpp' => 'pkg/common/GLDrawFunctors.hpp'
=== renamed file 'pkg/common/RenderingEngine/Gl1_Aabb.cpp' => 'pkg/common/Gl1_Aabb.cpp'
=== renamed file 'pkg/common/RenderingEngine/Gl1_Aabb.hpp' => 'pkg/common/Gl1_Aabb.hpp'
=== renamed file 'pkg/common/RenderingEngine/Gl1_Box.cpp' => 'pkg/common/Gl1_Box.cpp'
=== renamed file 'pkg/common/RenderingEngine/Gl1_Box.hpp' => 'pkg/common/Gl1_Box.hpp'
=== renamed file 'pkg/common/RenderingEngine/Gl1_Facet.cpp' => 'pkg/common/Gl1_Facet.cpp'
=== renamed file 'pkg/common/RenderingEngine/Gl1_Facet.hpp' => 'pkg/common/Gl1_Facet.hpp'
=== renamed file 'pkg/common/RenderingEngine/Gl1_NormPhys.cpp' => 'pkg/common/Gl1_NormPhys.cpp'
=== renamed file 'pkg/common/RenderingEngine/Gl1_NormPhys.hpp' => 'pkg/common/Gl1_NormPhys.hpp'
=== renamed file 'pkg/common/RenderingEngine/Gl1_Sphere.cpp' => 'pkg/common/Gl1_Sphere.cpp'
=== renamed file 'pkg/common/RenderingEngine/Gl1_Sphere.hpp' => 'pkg/common/Gl1_Sphere.hpp'
=== renamed file 'pkg/common/Engine/PartialEngine/GravityEngines.cpp' => 'pkg/common/GravityEngines.cpp'
=== renamed file 'pkg/common/Engine/PartialEngine/GravityEngines.hpp' => 'pkg/common/GravityEngines.hpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/InsertionSortCollider.cpp' => 'pkg/common/InsertionSortCollider.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/InsertionSortCollider.hpp' => 'pkg/common/InsertionSortCollider.hpp'
=== renamed file 'pkg/common/Engine/Dispatcher/InteractionLoop.cpp' => 'pkg/common/InteractionLoop.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/InteractionLoop.hpp' => 'pkg/common/InteractionLoop.hpp'
=== renamed file 'pkg/common/Engine/PartialEngine/LinearInterpolate.hpp' => 'pkg/common/LinearInterpolate.hpp'
=== renamed file 'pkg/common/DataClass/MatchMaker.cpp' => 'pkg/common/MatchMaker.cpp'
=== renamed file 'pkg/common/DataClass/MatchMaker.hpp' => 'pkg/common/MatchMaker.hpp'
=== renamed file 'pkg/common/DataClass/IPhys/NormShearPhys.cpp' => 'pkg/common/NormShearPhys.cpp'
=== renamed file 'pkg/common/DataClass/IPhys/NormShearPhys.hpp' => 'pkg/common/NormShearPhys.hpp'
=== renamed file 'pkg/common/RenderingEngine/OpenGLRenderer.cpp' => 'pkg/common/OpenGLRenderer.cpp'
=== renamed file 'pkg/common/RenderingEngine/OpenGLRenderer.hpp' => 'pkg/common/OpenGLRenderer.hpp'
=== renamed file 'pkg/common/Engine/ParallelEngine.cpp' => 'pkg/common/ParallelEngine.cpp'
=== renamed file 'pkg/common/Engine/ParallelEngine.hpp' => 'pkg/common/ParallelEngine.hpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/PeriodicEngines.cpp' => 'pkg/common/PeriodicEngines.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/PeriodicEngines.hpp' => 'pkg/common/PeriodicEngines.hpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/PersistentTriangulationCollider.cpp' => 'pkg/common/PersistentTriangulationCollider.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/PersistentTriangulationCollider.hpp' => 'pkg/common/PersistentTriangulationCollider.hpp'
=== renamed file 'pkg/common/Engine/PartialEngine/PressTestEngine.cpp' => 'pkg/common/PressTestEngine.cpp'
=== renamed file 'pkg/common/Engine/PartialEngine/PressTestEngine.hpp' => 'pkg/common/PressTestEngine.hpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/PyRunner.cpp' => 'pkg/common/PyRunner.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/PyRunner.hpp' => 'pkg/common/PyRunner.hpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/Recorder.cpp' => 'pkg/common/Recorder.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/Recorder.hpp' => 'pkg/common/Recorder.hpp'
=== removed directory 'pkg/common/RenderingEngine'
=== renamed file 'pkg/common/Engine/GlobalEngine/ResetRandomPosition.cpp' => 'pkg/common/ResetRandomPosition.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/ResetRandomPosition.hpp' => 'pkg/common/ResetRandomPosition.hpp'
=== renamed file 'pkg/common/Engine/PartialEngine/RotationEngine.cpp' => 'pkg/common/RotationEngine.cpp'
=== renamed file 'pkg/common/Engine/PartialEngine/RotationEngine.hpp' => 'pkg/common/RotationEngine.hpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/SpatialQuickSortCollider.cpp' => 'pkg/common/SpatialQuickSortCollider.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/SpatialQuickSortCollider.hpp' => 'pkg/common/SpatialQuickSortCollider.hpp'
=== renamed file 'pkg/common/DataClass/Shape/Sphere.cpp' => 'pkg/common/Sphere.cpp'
=== renamed file 'pkg/common/DataClass/Shape/Sphere.hpp' => 'pkg/common/Sphere.hpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/SpheresFactory.cpp' => 'pkg/common/SpheresFactory.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/SpheresFactory.hpp' => 'pkg/common/SpheresFactory.hpp'
=== renamed file 'pkg/common/Engine/PartialEngine/StepDisplacer.cpp' => 'pkg/common/StepDisplacer.cpp'
=== renamed file 'pkg/common/Engine/PartialEngine/StepDisplacer.hpp' => 'pkg/common/StepDisplacer.hpp'
=== renamed file 'pkg/common/Engine/PartialEngine/TorqueEngine.cpp' => 'pkg/common/TorqueEngine.cpp'
=== renamed file 'pkg/common/Engine/PartialEngine/TorqueEngine.hpp' => 'pkg/common/TorqueEngine.hpp'
=== renamed file 'pkg/common/Engine/PartialEngine/TranslationEngine.cpp' => 'pkg/common/TranslationEngine.cpp'
=== renamed file 'pkg/common/Engine/PartialEngine/TranslationEngine.hpp' => 'pkg/common/TranslationEngine.hpp'
=== renamed file 'pkg/common/DataClass/VelocityBins.cpp' => 'pkg/common/VelocityBins.cpp'
=== renamed file 'pkg/common/DataClass/VelocityBins.hpp' => 'pkg/common/VelocityBins.hpp'
=== renamed file 'pkg/common/DataClass/Shape/Wall.cpp' => 'pkg/common/Wall.cpp'
=== renamed file 'pkg/common/DataClass/Shape/Wall.hpp' => 'pkg/common/Wall.hpp'
=== renamed file 'pkg/dem/DataClass/IPhys/CapillaryPhys.cpp' => 'pkg/dem/CapillaryPhys.cpp'
=== renamed file 'pkg/dem/DataClass/IPhys/CapillaryPhys.hpp' => 'pkg/dem/CapillaryPhys.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/CapillaryPressureEngine.cpp' => 'pkg/dem/CapillaryPressureEngine.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/CapillaryPressureEngine.hpp' => 'pkg/dem/CapillaryPressureEngine.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/CapillaryStressRecorder.cpp' => 'pkg/dem/CapillaryStressRecorder.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/CapillaryStressRecorder.hpp' => 'pkg/dem/CapillaryStressRecorder.hpp'
=== renamed file 'pkg/dem/PreProcessor/CapillaryTriaxialTest.cpp' => 'pkg/dem/CapillaryTriaxialTest.cpp'
=== renamed file 'pkg/dem/PreProcessor/CapillaryTriaxialTest.hpp' => 'pkg/dem/CapillaryTriaxialTest.hpp'
=== renamed file 'pkg/dem/DataClass/Clump.cpp' => 'pkg/dem/Clump.cpp'
=== renamed file 'pkg/dem/DataClass/Clump.hpp' => 'pkg/dem/Clump.hpp'
=== renamed file 'pkg/dem/DataClass/Material/CohFrictMat.cpp' => 'pkg/dem/CohFrictMat.cpp'
=== renamed file 'pkg/dem/DataClass/Material/CohFrictMat.hpp' => 'pkg/dem/CohFrictMat.hpp'
=== renamed file 'pkg/dem/DataClass/IPhys/CohFrictPhys.cpp' => 'pkg/dem/CohFrictPhys.cpp'
=== renamed file 'pkg/dem/DataClass/IPhys/CohFrictPhys.hpp' => 'pkg/dem/CohFrictPhys.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/CohesionlessMomentRotation.cpp' => 'pkg/dem/CohesionlessMomentRotation.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/CohesionlessMomentRotation.hpp' => 'pkg/dem/CohesionlessMomentRotation.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp' => 'pkg/dem/CohesiveFrictionalContactLaw.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.hpp' => 'pkg/dem/CohesiveFrictionalContactLaw.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/CohesiveFrictionalPM.cpp' => 'pkg/dem/CohesiveFrictionalPM.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/CohesiveFrictionalPM.hpp' => 'pkg/dem/CohesiveFrictionalPM.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/CohesiveStateRPMRecorder.cpp' => 'pkg/dem/CohesiveStateRPMRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/CohesiveStateRPMRecorder.hpp' => 'pkg/dem/CohesiveStateRPMRecorder.hpp'
=== renamed file 'pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp' => 'pkg/dem/CohesiveTriaxialTest.cpp'
=== renamed file 'pkg/dem/PreProcessor/CohesiveTriaxialTest.hpp' => 'pkg/dem/CohesiveTriaxialTest.hpp'
=== renamed file 'pkg/dem/meta/ConcretePM.cpp' => 'pkg/dem/ConcretePM.cpp'
=== renamed file 'pkg/dem/meta/ConcretePM.hpp' => 'pkg/dem/ConcretePM.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/CundallStrack.cpp' => 'pkg/dem/CundallStrack.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/CundallStrack.hpp' => 'pkg/dem/CundallStrack.hpp'
=== removed directory 'pkg/dem/DataClass'
=== removed directory 'pkg/dem/DataClass/IGeom'
=== removed directory 'pkg/dem/DataClass/IPhys'
=== removed directory 'pkg/dem/DataClass/Material'
=== renamed file 'pkg/dem/DataClass/IGeom/Dem3DofGeom_FacetSphere.cpp' => 'pkg/dem/Dem3DofGeom_FacetSphere.cpp'
=== renamed file 'pkg/dem/DataClass/IGeom/Dem3DofGeom_FacetSphere.hpp' => 'pkg/dem/Dem3DofGeom_FacetSphere.hpp'
=== renamed file 'pkg/dem/DataClass/IGeom/Dem3DofGeom_SphereSphere.cpp' => 'pkg/dem/Dem3DofGeom_SphereSphere.cpp'
=== renamed file 'pkg/dem/DataClass/IGeom/Dem3DofGeom_SphereSphere.hpp' => 'pkg/dem/Dem3DofGeom_SphereSphere.hpp'
=== renamed file 'pkg/dem/DataClass/IGeom/Dem3DofGeom_WallSphere.cpp' => 'pkg/dem/Dem3DofGeom_WallSphere.cpp'
=== renamed file 'pkg/dem/DataClass/IGeom/Dem3DofGeom_WallSphere.hpp' => 'pkg/dem/Dem3DofGeom_WallSphere.hpp'
=== renamed file 'pkg/dem/DataClass/IGeom/DemXDofGeom.cpp' => 'pkg/dem/DemXDofGeom.cpp'
=== renamed file 'pkg/dem/DataClass/IGeom/DemXDofGeom.hpp' => 'pkg/dem/DemXDofGeom.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/Disp2DPropLoadEngine.cpp' => 'pkg/dem/Disp2DPropLoadEngine.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/Disp2DPropLoadEngine.hpp' => 'pkg/dem/Disp2DPropLoadEngine.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/DomainLimiter.cpp' => 'pkg/dem/DomainLimiter.cpp'
--- pkg/dem/Engine/GlobalEngine/DomainLimiter.cpp	2010-10-12 16:46:41 +0000
+++ pkg/dem/DomainLimiter.cpp	2010-10-13 16:23:08 +0000
@@ -67,8 +67,9 @@
 	assert(!((bool)scGeom && (bool)d3dGeom)); // nonsense
 	// get body objects
 	State *state1=Body::byId(id1,scene)->state.get(), *state2=Body::byId(id2,scene)->state.get();
-	if(state1->blockedDOFs!=State::DOF_ALL) { LOG_INFO("Blocking all DOFs for #"<<id1); state1->blockedDOFs=State::DOF_ALL;}
-	if(state2->blockedDOFs!=State::DOF_ALL) { LOG_INFO("Blocking all DOFs for #"<<id2); state2->blockedDOFs=State::DOF_ALL;}
+	scene->forces.sync();
+	if(state1->blockedDOFs!=State::DOF_RXRYRZ) { LOG_INFO("Blocking rotational DOFs for #"<<id1); state1->blockedDOFs=State::DOF_RXRYRZ;}
+	if(state2->blockedDOFs!=State::DOF_RXRYRZ) { LOG_INFO("Blocking rotational DOFs for #"<<id2); state2->blockedDOFs=State::DOF_RXRYRZ;}
 
 	if(step>*(_pathT.rbegin())){
 		LOG_INFO("Last step done, setting zero velocities on #"<<id1<<", #"<<id2<<".");
@@ -117,8 +118,12 @@
 	LOG_DEBUG("Absolute diff is "<<valDiff);
 	ptOurs+=valDiff;
 
+	// reset velocities where displacement is controlled
+	//for(int i=0; i<3; i++){ if(forceControl[i]==0){ state1.vel[i]=0; state2.vel[i]=0; }
+	
 	// shear is applied as rotation of id2: dε=r₁dθ → dθ=dε/r₁;
 	Vector3r vel[2],angVel[2];
+	State* states[]={state1,state2};
 	for(int i=0; i<2; i++){
 		int sign=(i==0?-1:1);
 		Real weight=(i==0?1-idWeight:idWeight);
@@ -163,15 +168,13 @@
 	LOG_DEBUG("Body #"<<id1<<", setting vel="<<vel[0]<<", angVel="<<angVel[0]);
 	LOG_DEBUG("Body #"<<id2<<", setting vel="<<vel[1]<<", angVel="<<angVel[1]);
 
-	#if 0
-		Real rot2y=valDiff[1]/gsc->refR2, rot2z=valDiff[2]/gsc->refR2;
-		Vector3r angVel2=(rot2y*axY+rot2z*axZ)/scene->dt;
-		Vector3r linVel2=axX*valDiff[0]/scene->dt;
-		state2->angVel=angVel2;
-		state2->vel=linVel2;
-		LOG_DEBUG("Body #"<<id2<<", setting vel="<<linVel2<<", angVel="<<angVel2);
-	#endif
-
+	/* find out where are we at in the path, run hooks if approriate */
+	// _pathT has the first (zero) value added by us, so we skip it
+	int nPathT=_pathT.size();
+	for(int i=1; i<nPathT; i++){
+		// i-th point on _pathT is (i-1)th on path; run corresponding hook, if it exists
+		if(step==_pathT[i] && hooks.size()>(i-1) && !hooks[i-1].empty()) pyRunString(hooks[i-1]);
+	}
 	step++;
 }
 

=== renamed file 'pkg/dem/Engine/GlobalEngine/DomainLimiter.hpp' => 'pkg/dem/DomainLimiter.hpp'
--- pkg/dem/Engine/GlobalEngine/DomainLimiter.hpp	2010-10-12 14:25:27 +0000
+++ pkg/dem/DomainLimiter.hpp	2010-10-13 16:23:08 +0000
@@ -20,12 +20,14 @@
 		virtual void action();
 		void postLoad(LawTester&);
 	DECLARE_LOGGER;
-	YADE_CLASS_BASE_DOC_ATTRS(LawTester,PartialEngine,"Prescribe and apply deformations of an interaction in terms of normal and shear displacements.",
+	YADE_CLASS_BASE_DOC_ATTRS(LawTester,PartialEngine,"Prescribe and apply deformations of an interaction in terms of normal and shear displacements. See :ysrc:`scripts/test/law-test.py`. ",
 		((vector<Vector3r>,path,,Attr::triggerPostLoad,"Loading path, where each Vector3 contains desired normal displacement and two components of the shear displacement (in local coordinate system, which is being tracked automatically."))
+		((vector<string>,hooks,,,"Python commands to be run when the corresponding point in path is reached, before doing other things in that particular step. See also :yref:`doneHook<LawTester.doneHook>`. "))
 		((Vector3r,ptOurs,Vector3r::Zero(),,"Current absolute configuration -- computed by ourselves from applied increments; should correspond to posTot."))
 		((Vector3r,shearTot,Vector3r::Zero(),,"Current total shear, in global coordinates (computed differently for :yref:`ScGeom` and :yref:`Dem3DofGeom`)."))
 		((Vector3r,ptGeom,Vector3r::Zero(),,"Current absolute configuration, in local coordinates; computed from *shearTot*, indirectly  from :yref:`IGeom`. |yupdate|"))
 		((bool,displIsRel,true,,"Whether displacement values in *path* are normalized by reference contact length (r1+r2 for 2 spheres)."))
+		((Vector3i,forceControl,Vector3i::Zero(),,"Select which components of path (non-zero value) have force (stress) rather than displacement (strain) meaning."))
 		((vector<int>,pathSteps,((void)"(constant step)",vector<int>(1,1)),Attr::triggerPostLoad,"Step number for corresponding values in :yref:`path<LawTester.path>`; if shorter than path, distance between last 2 values is used for the rest."))
 		((vector<int>,_pathT,,(Attr::readonly|Attr::noSave),"Time value corresponding to points on path, computed from *pathSteps*. Length is always the same as path."))
 		((vector<Vector3r>,_pathV,,(Attr::readonly|Attr::noSave),"Path values, computed from *path* by appending zero initial value."))

=== renamed file 'pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp' => 'pkg/dem/ElasticContactLaw.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp' => 'pkg/dem/ElasticContactLaw.hpp'
=== removed directory 'pkg/dem/Engine'
=== removed directory 'pkg/dem/Engine/Callback'
=== removed directory 'pkg/dem/Engine/Functor'
=== removed directory 'pkg/dem/Engine/GlobalEngine'
=== removed directory 'pkg/dem/Engine/PartialEngine'
=== renamed file 'pkg/dem/Engine/GlobalEngine/FacetTopologyAnalyzer.cpp' => 'pkg/dem/FacetTopologyAnalyzer.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/FacetTopologyAnalyzer.hpp' => 'pkg/dem/FacetTopologyAnalyzer.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/FlatGridCollider.cpp' => 'pkg/dem/FlatGridCollider.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/FlatGridCollider.hpp' => 'pkg/dem/FlatGridCollider.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/FlowEngine.cpp' => 'pkg/dem/FlowEngine.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/FlowEngine.hpp' => 'pkg/dem/FlowEngine.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ForceRecorder.cpp' => 'pkg/dem/ForceRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ForceRecorder.hpp' => 'pkg/dem/ForceRecorder.hpp'
=== renamed file 'pkg/dem/DataClass/IPhys/FrictPhys.cpp' => 'pkg/dem/FrictPhys.cpp'
=== renamed file 'pkg/dem/DataClass/IPhys/FrictPhys.hpp' => 'pkg/dem/FrictPhys.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/GlobalStiffnessTimeStepper.cpp' => 'pkg/dem/GlobalStiffnessTimeStepper.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/GlobalStiffnessTimeStepper.hpp' => 'pkg/dem/GlobalStiffnessTimeStepper.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/HertzMindlin.cpp' => 'pkg/dem/HertzMindlin.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/HertzMindlin.hpp' => 'pkg/dem/HertzMindlin.hpp'
=== renamed file 'pkg/dem/Engine/Functor/Ig2_Box_Sphere_ScGeom.cpp' => 'pkg/dem/Ig2_Box_Sphere_ScGeom.cpp'
=== renamed file 'pkg/dem/Engine/Functor/Ig2_Box_Sphere_ScGeom.hpp' => 'pkg/dem/Ig2_Box_Sphere_ScGeom.hpp'
=== renamed file 'pkg/dem/Engine/Functor/Ig2_Facet_Sphere_ScGeom.cpp' => 'pkg/dem/Ig2_Facet_Sphere_ScGeom.cpp'
=== renamed file 'pkg/dem/Engine/Functor/Ig2_Facet_Sphere_ScGeom.hpp' => 'pkg/dem/Ig2_Facet_Sphere_ScGeom.hpp'
=== renamed file 'pkg/dem/Engine/Functor/Ig2_Sphere_Sphere_ScGeom.cpp' => 'pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp'
=== renamed file 'pkg/dem/Engine/Functor/Ig2_Sphere_Sphere_ScGeom.hpp' => 'pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp'
=== renamed file 'pkg/dem/Engine/Functor/Ip2_2xCohFrictMat_CohFrictPhys.cpp' => 'pkg/dem/Ip2_2xCohFrictMat_CohFrictPhys.cpp'
=== renamed file 'pkg/dem/Engine/Functor/Ip2_2xCohFrictMat_CohFrictPhys.hpp' => 'pkg/dem/Ip2_2xCohFrictMat_CohFrictPhys.hpp'
=== renamed file 'pkg/dem/Engine/Functor/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.cpp' => 'pkg/dem/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.cpp'
=== renamed file 'pkg/dem/Engine/Functor/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.hpp' => 'pkg/dem/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.hpp'
=== renamed file 'pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_CapillaryPhys.cpp' => 'pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.cpp'
=== renamed file 'pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp' => 'pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp'
=== renamed file 'pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_FrictPhys.cpp' => 'pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.cpp'
=== renamed file 'pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_FrictPhys.hpp' => 'pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/KinemCNDEngine.cpp' => 'pkg/dem/KinemCNDEngine.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/KinemCNDEngine.hpp' => 'pkg/dem/KinemCNDEngine.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/KinemCNLEngine.cpp' => 'pkg/dem/KinemCNLEngine.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/KinemCNLEngine.hpp' => 'pkg/dem/KinemCNLEngine.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/KinemCNSEngine.cpp' => 'pkg/dem/KinemCNSEngine.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/KinemCNSEngine.hpp' => 'pkg/dem/KinemCNSEngine.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/KinemCTDEngine.cpp' => 'pkg/dem/KinemCTDEngine.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/KinemCTDEngine.hpp' => 'pkg/dem/KinemCTDEngine.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/KinemSimpleShearBox.cpp' => 'pkg/dem/KinemSimpleShearBox.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/KinemSimpleShearBox.hpp' => 'pkg/dem/KinemSimpleShearBox.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/Law2_ScGeom_CapillaryPhys_Capillarity.cpp' => 'pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/Law2_ScGeom_CapillaryPhys_Capillarity.hpp' => 'pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/MicroMacroAnalyser.cpp' => 'pkg/dem/MicroMacroAnalyser.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/MicroMacroAnalyser.hpp' => 'pkg/dem/MicroMacroAnalyser.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/NewtonIntegrator.cpp' => 'pkg/dem/NewtonIntegrator.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/NewtonIntegrator.hpp' => 'pkg/dem/NewtonIntegrator.hpp'
=== renamed file 'pkg/dem/DataClass/Material/NormalInelasticMat.cpp' => 'pkg/dem/NormalInelasticMat.cpp'
=== renamed file 'pkg/dem/DataClass/Material/NormalInelasticMat.hpp' => 'pkg/dem/NormalInelasticMat.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/NormalInelasticityLaw.cpp' => 'pkg/dem/NormalInelasticityLaw.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/NormalInelasticityLaw.hpp' => 'pkg/dem/NormalInelasticityLaw.hpp'
=== renamed file 'pkg/dem/DataClass/IPhys/NormalInelasticityPhys.cpp' => 'pkg/dem/NormalInelasticityPhys.cpp'
=== renamed file 'pkg/dem/DataClass/IPhys/NormalInelasticityPhys.hpp' => 'pkg/dem/NormalInelasticityPhys.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/NozzleFactory.cpp' => 'pkg/dem/NozzleFactory.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/NozzleFactory.hpp' => 'pkg/dem/NozzleFactory.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ParticleSizeDistrbutionRPMRecorder.cpp' => 'pkg/dem/ParticleSizeDistrbutionRPMRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ParticleSizeDistrbutionRPMRecorder.hpp' => 'pkg/dem/ParticleSizeDistrbutionRPMRecorder.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/PeriIsoCompressor.cpp' => 'pkg/dem/PeriIsoCompressor.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/PeriIsoCompressor.hpp' => 'pkg/dem/PeriIsoCompressor.hpp'
=== removed directory 'pkg/dem/PreProcessor'
=== renamed file 'pkg/dem/meta/RockPM.cpp' => 'pkg/dem/RockPM.cpp'
=== renamed file 'pkg/dem/meta/RockPM.hpp' => 'pkg/dem/RockPM.hpp'
=== renamed file 'pkg/dem/PreProcessor/STLImporter.cpp' => 'pkg/dem/STLImporter.cpp'
=== renamed file 'pkg/dem/PreProcessor/STLImporter.hpp' => 'pkg/dem/STLImporter.hpp'
=== renamed file 'pkg/dem/PreProcessor/STLImporterTest.cpp' => 'pkg/dem/STLImporterTest.cpp'
=== renamed file 'pkg/dem/PreProcessor/STLImporterTest.hpp' => 'pkg/dem/STLImporterTest.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/SampleCapillaryPressureEngine.cpp' => 'pkg/dem/SampleCapillaryPressureEngine.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/SampleCapillaryPressureEngine.hpp' => 'pkg/dem/SampleCapillaryPressureEngine.hpp'
=== renamed file 'pkg/dem/DataClass/IGeom/ScGeom.cpp' => 'pkg/dem/ScGeom.cpp'
=== renamed file 'pkg/dem/DataClass/IGeom/ScGeom.hpp' => 'pkg/dem/ScGeom.hpp'
=== renamed file 'pkg/dem/meta/Shop.cpp' => 'pkg/dem/Shop.cpp'
=== renamed file 'pkg/dem/meta/Shop.hpp' => 'pkg/dem/Shop.hpp'
=== renamed file 'pkg/dem/PreProcessor/SimpleShear.cpp' => 'pkg/dem/SimpleShear.cpp'
=== renamed file 'pkg/dem/PreProcessor/SimpleShear.hpp' => 'pkg/dem/SimpleShear.hpp'
=== renamed file 'pkg/dem/DataClass/SpherePack.cpp' => 'pkg/dem/SpherePack.cpp'
=== renamed file 'pkg/dem/DataClass/SpherePack.hpp' => 'pkg/dem/SpherePack.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/TesselationWrapper.cpp' => 'pkg/dem/TesselationWrapper.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/TesselationWrapper.hpp' => 'pkg/dem/TesselationWrapper.hpp'
=== renamed file 'pkg/dem/meta/Tetra.cpp' => 'pkg/dem/Tetra.cpp'
=== renamed file 'pkg/dem/meta/Tetra.hpp' => 'pkg/dem/Tetra.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.cpp' => 'pkg/dem/ThreeDTriaxialEngine.cpp' (properties changed: +x to -x)
=== renamed file 'pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.hpp' => 'pkg/dem/ThreeDTriaxialEngine.hpp' (properties changed: +x to -x)
=== renamed file 'pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp' => 'pkg/dem/TriaxialCompressionEngine.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.hpp' => 'pkg/dem/TriaxialCompressionEngine.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp' => 'pkg/dem/TriaxialStateRecorder.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.hpp' => 'pkg/dem/TriaxialStateRecorder.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/TriaxialStressController.cpp' => 'pkg/dem/TriaxialStressController.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp' => 'pkg/dem/TriaxialStressController.hpp'
=== renamed file 'pkg/dem/PreProcessor/TriaxialTest.cpp' => 'pkg/dem/TriaxialTest.cpp'
=== renamed file 'pkg/dem/PreProcessor/TriaxialTest.hpp' => 'pkg/dem/TriaxialTest.hpp'
=== renamed file 'pkg/dem/Engine/Callback/UnbalancedForceCallbacks.cpp' => 'pkg/dem/UnbalancedForceCallbacks.cpp'
=== renamed file 'pkg/dem/Engine/Callback/UnbalancedForceCallbacks.hpp' => 'pkg/dem/UnbalancedForceCallbacks.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/UniaxialStrainer.cpp' => 'pkg/dem/UniaxialStrainer.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/UniaxialStrainer.hpp' => 'pkg/dem/UniaxialStrainer.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/VTKRecorder.cpp' => 'pkg/dem/VTKRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/VTKRecorder.hpp' => 'pkg/dem/VTKRecorder.hpp'
=== renamed file 'pkg/dem/meta/ViscoelasticPM.cpp' => 'pkg/dem/ViscoelasticPM.cpp'
=== renamed file 'pkg/dem/meta/ViscoelasticPM.hpp' => 'pkg/dem/ViscoelasticPM.hpp'
=== renamed file 'pkg/dem/Engine/Functor/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.cpp' => 'pkg/dem/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.cpp'
=== renamed file 'pkg/dem/Engine/Functor/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.hpp' => 'pkg/dem/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.hpp'
=== renamed file 'pkg/dem/Engine/Functor/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp' => 'pkg/dem/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp'
=== renamed file 'pkg/dem/Engine/Functor/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.hpp' => 'pkg/dem/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.hpp'
=== removed directory 'pkg/dem/meta'
  Thread Previous • Date Previous • • Thread Next