yade-dev team mailing list archive

[Anton Gladky <gladk@xxxxxxxxxx>]

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: 43ff36352a264cab5328cee5a8ace2f9e3d7f583
      https://github.com/yade/trunk/commit/43ff36352a264cab5328cee5a8ace2f9e3d7f583
  Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M py/utils.py

  Log Message:
  -----------
  fix documentation of clumpTemplate in utils.py


  Commit: 4fc7afac975bacd3220d040f4ac7d60f78f10906
      https://github.com/yade/trunk/commit/4fc7afac975bacd3220d040f4ac7d60f78f10906
  Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M pkg/dem/ConcretePM.cpp
    M pkg/dem/ConcretePM.hpp
    M py/_utils.cpp

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: b721618718af3be3884f13673d17dc49f5fdd94e
      https://github.com/yade/trunk/commit/b721618718af3be3884f13673d17dc49f5fdd94e
  Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M py/utils.py
    M py/wrapper/yadeWrapper.cpp

  Log Message:
  -----------
  let replaceByClumps return a list of tuples with new clump ids and associated sphere ids


  Commit: ee85e8a7615f76bfd5837c2c48c28967f1f9e290
      https://github.com/yade/trunk/commit/ee85e8a7615f76bfd5837c2c48c28967f1f9e290
  Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M core/main/main.py.in
    M doc/sphinx/formulation.rst
    M doc/sphinx/installation.rst
    M doc/sphinx/templates/index.html
    M doc/yade-articles.bib
    M examples/triax-tutorial/script-session1.py
    M pkg/common/Grid.hpp
    M pkg/dem/FlowEngine.hpp
    M pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp
    M pkg/dem/ScGeom.hpp
    M pkg/dem/ThreeDTriaxialEngine.cpp
    M pkg/dem/TriaxialCompressionEngine.cpp
    M py/utils.py

  Log Message:
  -----------
  Merge remote branch 'upstream/master'


  Commit: fee5ef5289585b2f8a807e3db6d0e87dacc1b031
      https://github.com/yade/trunk/commit/fee5ef5289585b2f8a807e3db6d0e87dacc1b031
  Author: Anton Gladky <gladk@xxxxxxxxxx>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M py/utils.py
    M py/wrapper/yadeWrapper.cpp

  Log Message:
  -----------
  Merge pull request #34 from jakob-ifgt/master

doc fix and small change in replaceByClumps method


Compare: https://github.com/yade/trunk/compare/7bfe5a79ae52...fee5ef528958