yade-dev team mailing list archive

[bchareyre <bruno.chareyre@xxxxxxxxxxxxxxx>]

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: c9db8b0ccf360ac27610967c37370162f546e036
      https://github.com/yade/trunk/commit/c9db8b0ccf360ac27610967c37370162f546e036
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    A examples/ResetRandomPosition.py
  A examples/baraban/rotating-cylinder.py
  A examples/clumps/clump-hopper-viscoelastic.py
  A examples/clumps/clump-inbox-viscoelastic.py
  A examples/clumps/clump-viscoelastic.py
  R examples/not-working/ResetRandomPosition.py
  R examples/not-working/clump-hopper-viscoelastic.py
  R examples/not-working/clump-inbox-viscoelastic.py
  R examples/not-working/clump-viscoelastic.py
  R examples/not-working/rotating-cylinder.py

  Log Message:
  -----------
  Fix some examples.


  Commit: 1025779dd02d63c699b482b3f60bff3c28a3e11b
      https://github.com/yade/trunk/commit/1025779dd02d63c699b482b3f60bff3c28a3e11b
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    A examples/gts-horse/gts-horse.py
  A examples/gts-horse/gts-operators.py
  A examples/gts-horse/gts-random-pack-obb.py
  A examples/gts-horse/gts-random-pack.py
  A examples/gts-horse/horse.coarse.gts
  R examples/not-working/gts-horse/gts-horse.py
  R examples/not-working/gts-horse/gts-operators.py
  R examples/not-working/gts-horse/gts-random-pack-obb.py
  R examples/not-working/gts-horse/gts-random-pack.py
  R examples/not-working/gts-horse/horse.coarse.gts

  Log Message:
  -----------
  Reenable gts-scripts.


  Commit: dea7021ea3aec9c1f5994879a7755486df788904
      https://github.com/yade/trunk/commit/dea7021ea3aec9c1f5994879a7755486df788904
  Author: bchareyre <bruno.chareyre@xxxxxxxxxxxxxxx>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M pkg/dem/CapillaryPhys.hpp
  M pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp
  M pkg/dem/Ip2_FrictMat_FrictMat_MindlinCapillaryPhys.hpp
  M pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp

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

tried to merge with Antons updates


Compare: https://github.com/yade/trunk/compare/c86d6de...dea7021