yade-dev team mailing list archive

[Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>]

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: e1ed75d9b987724083769dd8109479d4f66d86ef
      https://github.com/yade/trunk/commit/e1ed75d9b987724083769dd8109479d4f66d86ef
  Author: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M py/pack/pack.py

  Log Message:
  -----------
  - fix again the offset of ids in SpherePack.toSimulation (previous fix was assuming two bodies per clump)


  Commit: fc20180e55ae1bb774fdce750300660af7bad76a
      https://github.com/yade/trunk/commit/fc20180e55ae1bb774fdce750300660af7bad76a
  Author: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M pkg/dem/NewtonIntegrator.cpp

  Log Message:
  -----------
  - fix https://bugs.launchpad.net/yade/+bug/923929 again, as shown by François it could still happen in some cases (see example in the bug report)


  Commit: 565426b13306961eecf139d93e3f5da57cbf996a
      https://github.com/yade/trunk/commit/565426b13306961eecf139d93e3f5da57cbf996a
  Author: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

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

  Log Message:
  -----------
  Merge remote branch 'origin'

Conflicts:
	py/pack/pack.py


Compare: https://github.com/yade/trunk/compare/075520537aeb...565426b13306