yade-dev team mailing list archive

[Francois Kneib <francois.kneib@xxxxxxxxx>]

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: 42c29b1cc81773186bd22d3699263d7d96d289ac
      https://github.com/yade/trunk/commit/42c29b1cc81773186bd22d3699263d7d96d289ac
  Author: François Kneib <franz@XPS15z.(none)>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M py/pack/pack.py

  Log Message:
  -----------
  Correct a remaining bug into the toSimulation() python function.


  Commit: 075520537aeb267d2a2300c2dc0f062137e744b6
      https://github.com/yade/trunk/commit/075520537aeb267d2a2300c2dc0f062137e744b6
  Author: Donia Marzougui <donia.marzougui@xxxxxxxxxxx>
  Date:   2012-11-27 (Tue, 27 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:
  -----------
  Fix the computation of viscous forces by using the correct positions of bodies (updated in buildTriangulation), and fix some variable names.


  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


  Commit: 7566449950c93626b6bcd2ef2d34857f54e39293
      https://github.com/yade/trunk/commit/7566449950c93626b6bcd2ef2d34857f54e39293
  Author: Francois Kneib <francois.kneib@xxxxxxxxx>
  Date:   2012-12-03 (Mon, 03 Dec 2012)

  Changed paths:
    A examples/test/combined-kinematic-engine.py
    M examples/test/peri3dController_example1.py
    M examples/test/peri3dController_shear.py
    M pkg/dem/PeriIsoCompressor.cpp
    M pkg/dem/SpherePack.cpp
    M py/_utils.cpp
    M py/pack/pack.py

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


  Commit: 750c955a5aad2ca06fb98839a2787ab5c5c377ef
      https://github.com/yade/trunk/commit/750c955a5aad2ca06fb98839a2787ab5c5c377ef
  Author: Francois Kneib <francois.kneib@xxxxxxxxx>
  Date:   2012-12-03 (Mon, 03 Dec 2012)

  Changed paths:
    M doc/sphinx/installation.rst
    M py/pack/pack.py

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


  Commit: 1aad96a744e581642889e3669244c9b545690bba
      https://github.com/yade/trunk/commit/1aad96a744e581642889e3669244c9b545690bba
  Author: Francois Kneib <francois.kneib@xxxxxxxxx>
  Date:   2012-12-03 (Mon, 03 Dec 2012)

  Changed paths:
    M py/pack/pack.py

  Log Message:
  -----------
  Corrected toSimulation() (for the last time I hope :-) ).


Compare: https://github.com/yade/trunk/compare/d937726db0a3...1aad96a744e5