← Back to team overview

yade-dev team mailing list archive

[yade/trunk] 66876a: Revert "Fix the computation of the shear lubricati...

 

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: 66876a1e3206157154b1a8b3e1be3f6600d5dbf6
      https://github.com/yade/trunk/commit/66876a1e3206157154b1a8b3e1be3f6600d5dbf6
  Author: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

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

  Log Message:
  -----------
  Revert "Fix the computation of the shear lubrication force and add the torque of the viscous shear force applied on particles."
This commit erased some of the previous changes. Please Donia double-check what you commit everytime.

This reverts commit 67f1656572118a5be51791df1b18646721226f67.


  Commit: 1806b4c4ac68eba94e47c6efc33e25a156e3ccb0
      https://github.com/yade/trunk/commit/1806b4c4ac68eba94e47c6efc33e25a156e3ccb0
  Author: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M pkg/common/Gl1_NormPhys.hpp
    M py/wrapper/yadeWrapper.cpp

  Log Message:
  -----------
  fix two compile warnings


  Commit: e36e361064aada0a37be9698976429add3bdf136
      https://github.com/yade/trunk/commit/e36e361064aada0a37be9698976429add3bdf136
  Author: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M pkg/common/Gl1_NormPhys.hpp

  Log Message:
  -----------
  The \` are displayed correctly by sphinx. Get them back (at the price of many warnings?...)


Compare: https://github.com/yade/trunk/compare/38d19fa45504...e36e361064aa