yade-dev team mailing list archive

[Anton Gladky <gladky.anton@xxxxxxxxx>]

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: 0bb8ad658256c7ae2d8abbb5d0a55293b642e997
      https://github.com/yade/trunk/commit/0bb8ad658256c7ae2d8abbb5d0a55293b642e997
  Author: Nolan Dyck <ndyck@xxxxxx>
  Date:   2013-07-05 (Fri, 05 Jul 2013)

  Changed paths:
    M pkg/dem/BubbleMat.hpp

  Log Message:
  -----------
  Updated function descriptions for BubbleMat


  Commit: c48d742b2924916740891fa2572bd956b821f693
      https://github.com/yade/trunk/commit/c48d742b2924916740891fa2572bd956b821f693
  Author: Nolan Dyck <ndyck@xxxxxx>
  Date:   2013-07-05 (Fri, 05 Jul 2013)

  Changed paths:
    M CMakeLists.txt
    M cMake/FindCholmod.cmake
    M cMake/FindLoki.cmake
    A cMake/FindMetis.cmake
    A cMake/FindOpenBlas.cmake
    M core/Clump.cpp
    M core/Clump.hpp
    M doc/references.bib
    M doc/yade-articles.bib
    A examples/PIDController.py
    R examples/clumps/adaptClumpMasses-example.py
    M examples/clumps/apply-buoyancy-clumps.py
    M gui/CMakeLists.txt
    M lib/base/Math.hpp
    M lib/triangulation/FlowBoundingSphere.cpp
    M lib/triangulation/FlowBoundingSphere.hpp
    M lib/triangulation/FlowBoundingSphere.ipp
    A lib/triangulation/FlowBoundingSphereLinSolv.hpp
    A lib/triangulation/FlowBoundingSphereLinSolv.ipp
    A lib/triangulation/PeriodicFlowLinSolv.hpp
    A lib/triangulation/PeriodicFlowLinSolv.ipp
    M pkg/common/KinematicEngines.cpp
    M pkg/common/KinematicEngines.hpp
    M pkg/dem/InelastCohFrictMat.hpp
    M pkg/dem/InelastCohFrictPhys.cpp
    M pkg/dem/InelastCohFrictPhys.hpp
    M pkg/dem/Ip2_2xInelastCohFrictMat_InelastCohFrictPhys.cpp
    M pkg/dem/Ip2_2xInelastCohFrictMat_InelastCohFrictPhys.hpp
    M pkg/dem/Law2_ScGeom6D_InelastCohFrictPhys_CohesionMoment.cpp
    M pkg/dem/Law2_ScGeom6D_InelastCohFrictPhys_CohesionMoment.hpp
    M pkg/dem/Shop.cpp
    M pkg/dem/WirePM.cpp
    M pkg/dem/WirePM.hpp
    M py/CMakeLists.txt
    M py/tests/clump.py
    M py/wrapper/yadeWrapper.cpp
    A scripts/checks-and-tests/checks/checkWirePM.py

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


  Commit: dffea16027e91399cd883b725ca102bc61d67117
      https://github.com/yade/trunk/commit/dffea16027e91399cd883b725ca102bc61d67117
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M doc/references.bib
    A pkg/dem/LudingPM.cpp
    A pkg/dem/LudingPM.hpp

  Log Message:
  -----------
  Add LudingPM.


  Commit: 3927ef143d83011607b005aa0408283b8f2824bb
      https://github.com/yade/trunk/commit/3927ef143d83011607b005aa0408283b8f2824bb
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M pkg/dem/BubbleMat.hpp

  Log Message:
  -----------
  Merge branch 'ndyck'


Compare: https://github.com/yade/trunk/compare/839861272af9...3927ef143d83