yade-dev team mailing list archive

[Jan Stransky <jan.stransky@xxxxxxxxxxx>]

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: eeb0fb10a752a5ba216833eb58d2990c691ef17a
      https://github.com/yade/trunk/commit/eeb0fb10a752a5ba216833eb58d2990c691ef17a
  Author: Jan Stransky <jan.stransky@xxxxxxxxxxx>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M examples/test/peri3dController_example1.py
    M examples/test/peri3dController_shear.py
    M pkg/dem/PeriIsoCompressor.cpp
    M py/_utils.cpp

  Log Message:
  -----------
  little modifications


  Commit: 98f441fa74aec288e559263bc007a5e7ff67f0bd
      https://github.com/yade/trunk/commit/98f441fa74aec288e559263bc007a5e7ff67f0bd
  Author: Jan Stransky <jan.stransky@xxxxxxxxxxx>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M CMakeLists.txt
    M core/Engine.hpp
    M doc/sphinx/conf.py
    M doc/sphinx/yadeSphinx.py
    R examples/not-working/SpherePadder-test.msh
    R examples/not-working/SpherePadder.py
    M gui/CMakeLists.txt
    M gui/qt4/GLViewer.cpp
    M gui/qt4/GLViewer.hpp
    M gui/qt4/_GLViewer.cpp
    M lib/triangulation/FlowBoundingSphere.hpp
    M lib/triangulation/FlowBoundingSphere.ipp
    M pkg/common/Collider.cpp
    M pkg/common/Collider.hpp
    M pkg/common/Grid.cpp
    M pkg/common/Grid.hpp
    M pkg/common/InteractionLoop.hpp
    M pkg/common/ParallelEngine.hpp
    M pkg/dem/FlowEngine.cpp
    M pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp
    M pkg/dem/Shop.cpp
    M pkg/dem/Shop.hpp
    A pkg/dem/SnapshotEngine.cpp
    A pkg/dem/SnapshotEngine.hpp
    M pkg/dem/TriaxialCompressionEngine.cpp
    M py/_utils.cpp
    R py/pack/SpherePadder/CellPartition.cpp
    R py/pack/SpherePadder/CellPartition.hpp
    R py/pack/SpherePadder/SpherePackingTriangulation.cpp
    R py/pack/SpherePadder/SpherePackingTriangulation.hpp
    R py/pack/SpherePadder/SpherePadder.cpp
    R py/pack/SpherePadder/SpherePadder.hpp
    R py/pack/SpherePadder/TetraMesh.cpp
    R py/pack/SpherePadder/TetraMesh.hpp
    R py/pack/SpherePadder/main.cpp
    R py/pack/_packSpherePadder.cpp
    M py/pack/pack.py
    M py/utils.py
    M scripts/linkdeps.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:yade/trunk


  Commit: a3dcfbece454b16450e2e1a97b27029f8b18b0ba
      https://github.com/yade/trunk/commit/a3dcfbece454b16450e2e1a97b27029f8b18b0ba
  Author: Jan Stransky <jan.stransky@xxxxxxxxxxx>
  Date:   2012-11-29 (Thu, 29 Nov 2012)

  Changed paths:
    M core/Cell.hpp
    M core/Engine.hpp
    M core/main/main.py.in
    M lib/triangulation/FlowBoundingSphere.hpp
    M lib/triangulation/FlowBoundingSphere.ipp
    M lib/triangulation/PeriodicFlow.cpp
    M lib/triangulation/PeriodicFlow.hpp
    M lib/triangulation/def_types.h
    M pkg/common/Cylinder.hpp
    M pkg/common/Gl1_Sphere.hpp
    M pkg/common/Grid.cpp
    M pkg/common/Grid.hpp
    M pkg/dem/ConcretePM.hpp
    M pkg/dem/FlowEngine.cpp
    M pkg/dem/FlowEngine.hpp
    M pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp
    M pkg/dem/NewtonIntegrator.cpp
    M pkg/dem/SampleCapillaryPressureEngine.hpp
    M pkg/dem/SimpleShear.hpp
    M pkg/dem/ThreeDTriaxialEngine.hpp
    M py/pack/pack.py
    M py/utils.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:yade/trunk


  Commit: 78b60a02a38de131a2de97f54ba5387ad53b63bd
      https://github.com/yade/trunk/commit/78b60a02a38de131a2de97f54ba5387ad53b63bd
  Author: Jan Stransky <jan.stransky@xxxxxxxxxxx>
  Date:   2012-11-30 (Fri, 30 Nov 2012)

  Changed paths:
    A examples/test/combined-kinematic-engine.py

  Log Message:
  -----------
  added example script for CombinedKinematicEngine


  Commit: afe4e4f2043ee66a535d6009d244544ce34e7289
      https://github.com/yade/trunk/commit/afe4e4f2043ee66a535d6009d244544ce34e7289
  Author: Jan Stransky <jan.stransky@xxxxxxxxxxx>
  Date:   2012-11-30 (Fri, 30 Nov 2012)

  Changed paths:
    M lib/triangulation/FlowBoundingSphere.ipp
    M lib/triangulation/PeriodicFlow.cpp
    M pkg/dem/FlowEngine.cpp
    M pkg/dem/SpherePack.cpp

  Log Message:
  -----------
  Merge branch 'master' of github.com:yade/trunk


Compare: https://github.com/yade/trunk/compare/e6e027a0accd...afe4e4f2043e