yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Václav Šmilauer (eudoxos)
------------------------------------------------------------
revno: 2541 [merge]
committer: Václav Šmilauer <eu@xxxxxxxx>
branch nick: yade
timestamp: Fri 2010-11-12 09:03:16 +0100
message:
  1. Fix include paths pkg-common to pkg/common etc, merge other changes.
added:
  CMakeLists.txt
modified:
  SConstruct
  core/Body.hpp
  core/BodyContainer.hpp
  core/Bound.hpp
  core/Cell.hpp
  core/Dispatcher.hpp
  core/EnergyTracker.hpp
  core/Engine.hpp
  core/FileGenerator.cpp
  core/FileGenerator.hpp
  core/ForceContainer.hpp
  core/FrontEnd.hpp
  core/Functor.hpp
  core/GroupRelationData.hpp
  core/IGeom.hpp
  core/IPhys.hpp
  core/Interaction.hpp
  core/InteractionContainer.hpp
  core/Material.hpp
  core/Omega.cpp
  core/Omega.hpp
  core/Scene.cpp
  core/Shape.hpp
  core/State.hpp
  core/corePlugins.cpp
  core/main/pyboot.cpp
  gui/qt4/GLViewer.cpp
  gui/qt4/GLViewer.hpp
  gui/qt4/_GLViewer.cpp
  lib/base/Math.cpp
  lib/base/openmp-accu.hpp
  lib/factory/ClassFactory.cpp
  lib/factory/ClassFactory.hpp
  lib/factory/DynLibManager.hpp
  lib/multimethods/DynLibDispatcher.hpp
  lib/multimethods/FunctorWrapper.hpp
  lib/opengl/GLUtils.hpp
  lib/opengl/OpenGLWrapper.hpp
  lib/pyutil/gil.cpp
  lib/serialization/Serializable.hpp
  lib/smoothing/WeightedAverage2d.hpp
  pkg/common/Bo1_Box_Aabb.cpp
  pkg/common/Bo1_Box_Aabb.hpp
  pkg/common/Bo1_Facet_Aabb.cpp
  pkg/common/Bo1_Facet_Aabb.hpp
  pkg/common/Bo1_Sphere_Aabb.cpp
  pkg/common/Bo1_Sphere_Aabb.hpp
  pkg/common/BoundaryController.cpp
  pkg/common/Callbacks.cpp
  pkg/common/Callbacks.hpp
  pkg/common/Collider.cpp
  pkg/common/Collider.hpp
  pkg/common/Cylinder.cpp
  pkg/common/Cylinder.hpp
  pkg/common/Dispatching.cpp
  pkg/common/Dispatching.hpp
  pkg/common/ElastMat.cpp
  pkg/common/FieldApplier.cpp
  pkg/common/ForceEngine.cpp
  pkg/common/ForceResetter.cpp
  pkg/common/GLDrawFunctors.cpp
  pkg/common/GLDrawFunctors.hpp
  pkg/common/Gl1_Aabb.cpp
  pkg/common/Gl1_Aabb.hpp
  pkg/common/Gl1_Box.cpp
  pkg/common/Gl1_Box.hpp
  pkg/common/Gl1_Facet.cpp
  pkg/common/Gl1_Facet.hpp
  pkg/common/Gl1_NormPhys.cpp
  pkg/common/Gl1_NormPhys.hpp
  pkg/common/Gl1_Sphere.cpp
  pkg/common/Gl1_Sphere.hpp
  pkg/common/GravityEngines.cpp
  pkg/common/GravityEngines.hpp
  pkg/common/InsertionSortCollider.cpp
  pkg/common/InsertionSortCollider.hpp
  pkg/common/InteractionLoop.hpp
  pkg/common/MatchMaker.cpp
  pkg/common/MatchMaker.hpp
  pkg/common/OpenGLRenderer.cpp
  pkg/common/OpenGLRenderer.hpp
  pkg/common/PeriodicEngines.cpp
  pkg/common/PersistentTriangulationCollider.cpp
  pkg/common/PersistentTriangulationCollider.hpp
  pkg/common/PressTestEngine.hpp
  pkg/common/PyRunner.cpp
  pkg/common/PyRunner.hpp
  pkg/common/Recorder.cpp
  pkg/common/Recorder.hpp
  pkg/common/ResetRandomPosition.cpp
  pkg/common/ResetRandomPosition.hpp
  pkg/common/RotationEngine.cpp
  pkg/common/RotationEngine.hpp
  pkg/common/SpatialQuickSortCollider.hpp
  pkg/common/SpheresFactory.cpp
  pkg/common/SpheresFactory.hpp
  pkg/common/TranslationEngine.hpp
  pkg/common/Wall.cpp
  pkg/common/Wall.hpp
  pkg/dem/CapillaryPhys.cpp
  pkg/dem/CapillaryPhys.hpp
  pkg/dem/CapillaryPressureEngine.cpp
  pkg/dem/CapillaryPressureEngine.hpp
  pkg/dem/CapillaryStressRecorder.cpp
  pkg/dem/CapillaryStressRecorder.hpp
  pkg/dem/CapillaryTriaxialTest.cpp
  pkg/dem/CapillaryTriaxialTest.hpp
  pkg/dem/Clump.hpp
  pkg/dem/CohFrictMat.hpp
  pkg/dem/CohFrictPhys.hpp
  pkg/dem/CohesionlessMomentRotation.cpp
  pkg/dem/CohesionlessMomentRotation.hpp
  pkg/dem/CohesiveFrictionalContactLaw.cpp
  pkg/dem/CohesiveFrictionalContactLaw.hpp
  pkg/dem/CohesiveFrictionalPM.cpp
  pkg/dem/CohesiveFrictionalPM.hpp
  pkg/dem/CohesiveStateRPMRecorder.hpp
  pkg/dem/CohesiveTriaxialTest.cpp
  pkg/dem/CohesiveTriaxialTest.hpp
  pkg/dem/ConcretePM.cpp
  pkg/dem/ConcretePM.hpp
  pkg/dem/CundallStrack.cpp
  pkg/dem/CundallStrack.hpp
  pkg/dem/Dem3DofGeom_FacetSphere.cpp
  pkg/dem/Dem3DofGeom_FacetSphere.hpp
  pkg/dem/Dem3DofGeom_SphereSphere.cpp
  pkg/dem/Dem3DofGeom_SphereSphere.hpp
  pkg/dem/Dem3DofGeom_WallSphere.cpp
  pkg/dem/Dem3DofGeom_WallSphere.hpp
  pkg/dem/Disp2DPropLoadEngine.cpp
  pkg/dem/Disp2DPropLoadEngine.hpp
  pkg/dem/DomainLimiter.cpp
  pkg/dem/DomainLimiter.hpp
  pkg/dem/ElasticContactLaw.cpp
  pkg/dem/ElasticContactLaw.hpp
  pkg/dem/FacetTopologyAnalyzer.cpp
  pkg/dem/FlatGridCollider.cpp
  pkg/dem/FlatGridCollider.hpp
  pkg/dem/FlowEngine.cpp
  pkg/dem/FlowEngine.hpp
  pkg/dem/ForceRecorder.hpp
  pkg/dem/FrictPhys.hpp
  pkg/dem/GlobalStiffnessTimeStepper.cpp
  pkg/dem/HertzMindlin.cpp
  pkg/dem/HertzMindlin.hpp
  pkg/dem/Ig2_Box_Sphere_ScGeom.cpp
  pkg/dem/Ig2_Box_Sphere_ScGeom.hpp
  pkg/dem/Ig2_Facet_Sphere_ScGeom.cpp
  pkg/dem/Ig2_Facet_Sphere_ScGeom.hpp
  pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp
  pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp
  pkg/dem/Ip2_2xCohFrictMat_CohFrictPhys.cpp
  pkg/dem/Ip2_2xCohFrictMat_CohFrictPhys.hpp
  pkg/dem/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.cpp
  pkg/dem/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.hpp
  pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.cpp
  pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp
  pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.cpp
  pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp
  pkg/dem/KinemCNDEngine.cpp
  pkg/dem/KinemCNDEngine.hpp
  pkg/dem/KinemCNLEngine.cpp
  pkg/dem/KinemCNLEngine.hpp
  pkg/dem/KinemCNSEngine.cpp
  pkg/dem/KinemCNSEngine.hpp
  pkg/dem/KinemCTDEngine.cpp
  pkg/dem/KinemCTDEngine.hpp
  pkg/dem/KinemSimpleShearBox.cpp
  pkg/dem/KinemSimpleShearBox.hpp
  pkg/dem/L3Geom.cpp
  pkg/dem/L3Geom.hpp
  pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
  pkg/dem/MicroMacroAnalyser.cpp
  pkg/dem/MicroMacroAnalyser.hpp
  pkg/dem/NewtonIntegrator.cpp
  pkg/dem/NewtonIntegrator.hpp
  pkg/dem/NormalInelasticMat.hpp
  pkg/dem/NormalInelasticityLaw.cpp
  pkg/dem/NormalInelasticityLaw.hpp
  pkg/dem/NormalInelasticityPhys.hpp
  pkg/dem/NozzleFactory.cpp
  pkg/dem/NozzleFactory.hpp
  pkg/dem/ParticleSizeDistrbutionRPMRecorder.hpp
  pkg/dem/PeriIsoCompressor.cpp
  pkg/dem/PeriIsoCompressor.hpp
  pkg/dem/RockPM.cpp
  pkg/dem/RockPM.hpp
  pkg/dem/STLImporter.cpp
  pkg/dem/STLImporter.hpp
  pkg/dem/STLImporterTest.cpp
  pkg/dem/SampleCapillaryPressureEngine.cpp
  pkg/dem/SampleCapillaryPressureEngine.hpp
  pkg/dem/ScGeom.hpp
  pkg/dem/Shop.cpp
  pkg/dem/Shop.hpp
  pkg/dem/SimpleShear.cpp
  pkg/dem/SpherePack.cpp
  pkg/dem/SpherePack.hpp
  pkg/dem/TesselationWrapper.cpp
  pkg/dem/TesselationWrapper.hpp
  pkg/dem/Tetra.cpp
  pkg/dem/Tetra.hpp
  pkg/dem/ThreeDTriaxialEngine.cpp
  pkg/dem/ThreeDTriaxialEngine.hpp
  pkg/dem/TriaxialCompressionEngine.cpp
  pkg/dem/TriaxialCompressionEngine.hpp
  pkg/dem/TriaxialStateRecorder.cpp
  pkg/dem/TriaxialStateRecorder.hpp
  pkg/dem/TriaxialStressController.cpp
  pkg/dem/TriaxialStressController.hpp
  pkg/dem/TriaxialTest.cpp
  pkg/dem/UnbalancedForceCallbacks.cpp
  pkg/dem/UnbalancedForceCallbacks.hpp
  pkg/dem/UniaxialStrainer.cpp
  pkg/dem/UniaxialStrainer.hpp
  pkg/dem/VTKRecorder.cpp
  pkg/dem/VTKRecorder.hpp
  pkg/dem/ViscoelasticPM.cpp
  pkg/dem/ViscoelasticPM.hpp
  pkg/dem/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.cpp
  pkg/dem/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.hpp
  pkg/dem/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp
  pkg/dem/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.hpp
  py/WeightedAverage2d.cpp
  py/_eudoxos.cpp
  py/_utils.cpp
  py/log.cpp
  py/mathWrap/miniEigen.cpp
  py/pack/SpherePadder/SpherePadder.hpp
  py/pack/_packObb.cpp
  py/pack/_packPredicates.cpp
  py/pack/_packSpherePadder.cpp
  py/pack/_packSpheres.cpp
  py/wrapper/customConverters.cpp
  py/wrapper/yadeWrapper.cpp
  yadeSCons.py
The size of the diff (4283 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