yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Anton Gladky (gladky-anton)
  Václav Šmilauer (eudoxos)
------------------------------------------------------------
revno: 1813 [merge]
committer: Sergei D. <sega@think>
branch nick: clumps
timestamp: Thu 2009-11-26 15:57:26 +0300
message:
  merge clump branch with trunk
removed:
  extra/PeriodicInsertionSortCollider.cpp
  extra/PeriodicInsertionSortCollider.hpp
added:
  pkg/dem/Engine/StandAloneEngine/PeriIsoCompressor.cpp
  pkg/dem/Engine/StandAloneEngine/PeriIsoCompressor.hpp
  py/tests/omega.py
  py/ymport.py
renamed:
  scripts/test/regular-sphere-pack-LSMGegGeo.geo => scripts/test/regular-sphere-pack-LSMGenGeo.geo
modified:
  SConstruct
  core/Collider.cpp
  core/Collider.hpp
  core/InteractingGeometry.hpp
  core/Material.cpp
  core/Material.hpp
  core/MetaBody.cpp
  core/MetaBody.hpp
  core/NullGUI.cpp
  core/Omega.cpp
  core/Omega.hpp
  core/SimulationFlow.cpp
  core/containers/BodyRedirectionVector.cpp
  debian/control-template
  doc/yade-epydoc.conf
  examples/STLImporterTest.py
  examples/concrete/uniax-post.py
  examples/concrete/uniax.py
  extra/SConscript
  gui/py/PythonUI_rc.py
  pkg/common/DataClass/InteractingGeometry/InteractingBox.hpp
  pkg/common/DataClass/InteractingGeometry/InteractingSphere.hpp
  pkg/common/DataClass/Material/ElasticMat.hpp
  pkg/common/Engine/DeusExMachina/CinemCNCEngine.cpp
  pkg/common/Engine/DeusExMachina/CinemKNCEngine.cpp
  pkg/common/Engine/DeusExMachina/PressTestEngine.cpp
  pkg/common/Engine/DeusExMachina/TranslationEngine.cpp
  pkg/common/Engine/MetaEngine/ConstitutiveLawDispatcher.cpp
  pkg/common/Engine/MetaEngine/InteractionDispatchers.cpp
  pkg/common/Engine/MetaEngine/InteractionGeometryMetaEngine.cpp
  pkg/common/Engine/MetaEngine/InteractionPhysicsMetaEngine.cpp
  pkg/common/Engine/StandAloneEngine/InsertionSortCollider.cpp
  pkg/common/Engine/StandAloneEngine/InsertionSortCollider.hpp
  pkg/common/Engine/StandAloneEngine/PersistentTriangulationCollider.cpp
  pkg/common/Engine/StandAloneEngine/PersistentTriangulationCollider.hpp
  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/OpenGLRenderingEngine.cpp
  pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp
  pkg/dem/Engine/DeusExMachina/CapillaryRecorder.cpp
  pkg/dem/Engine/DeusExMachina/CapillaryStressRecorder.cpp
  pkg/dem/Engine/DeusExMachina/ContactStressRecorder.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/StandAloneEngine/CapillaryCohesiveLaw.cpp
  pkg/dem/Engine/StandAloneEngine/CohesiveFrictionalContactLaw.cpp
  pkg/dem/Engine/StandAloneEngine/ContactLaw1.cpp
  pkg/dem/Engine/StandAloneEngine/ElasticCriterionTimeStepper.cpp
  pkg/dem/Engine/StandAloneEngine/ForceSnapshot.cpp
  pkg/dem/Engine/StandAloneEngine/ForceSnapshot.hpp
  pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.cpp
  pkg/dem/Engine/StandAloneEngine/HistoryRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/MicroMacroAnalyser.cpp
  pkg/dem/Engine/StandAloneEngine/NewtonsDampedLaw.cpp
  pkg/dem/Engine/StandAloneEngine/NewtonsDampedLaw.hpp
  pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/VTKRecorder.cpp
  pkg/dem/Engine/StandAloneEngine/ViscousForceDamping.cpp
  pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.cpp
  pkg/dem/PreProcessor/UniaxialStrainerGen.cpp
  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.hpp
  pkg/lattice/Engine/StandAloneEngine/LatticeLaw.cpp
  pkg/lattice/Engine/StandAloneEngine/NonLocalInitializer.cpp
  pkg/lattice/Engine/StandAloneEngine/StrainRecorder.cpp
  pkg/snow/Engine/ElawSnowLayersDeformation.cpp
  py/SConscript
  py/_eudoxos.cpp
  py/_utils.cpp
  py/pack.py
  py/post2d.py
  py/tests/__init__.py
  py/tests/wrapper.py
  py/utils.py
  py/yadeWrapper/customConverters.cpp
  py/yadeWrapper/yadeWrapper.cpp
  scripts/regression-tests.py
  scripts/test/facet-sphere.py
  scripts/test/gts-random-pack.py
  scripts/test/periodic-compress.py
  scripts/test/periodic-grow.py
  scripts/test/periodic-simple.py
  scripts/test/regular-sphere-pack.py
The size of the diff (5241 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.