← Back to team overview

yade-dev team mailing list archive

Re: [yade/trunk] 2ae187: Improvements in Law2_ScGeom_CapillaryPhys_Capillar...

 

Hi Anton,

What is the meaning of this message? Do you know why it has been sent today?

Bruno

On 10/04/12 17:20, Anton Gladky wrote:
>   Branch: refs/heads/jakob-ifgt
>   Home:   https://github.com/yade/trunk
>   Commit: 2ae187f4e1b7ce49c063e20fdd0253c4e0a4c85c
>       https://github.com/yade/trunk/commit/2ae187f4e1b7ce49c063e20fdd0253c4e0a4c85c
>   Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
>   Date:   2012-03-19 (Mon, 19 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
>   A scripts/scanreplace.pyc
>   A site_scons/site_tools/qt4/__init__.pyc
>   A yadeSCons.pyc
>
>   Log Message:
>   -----------
>   Improvements in Law2_ScGeom_CapillaryPhys_Capillarity.cpp (included isBroken flag and updated checkFusion)
>
>
>   Commit: f2f51857c93cd6a1a03baa67e36f813d6cd991bd
>       https://github.com/yade/trunk/commit/f2f51857c93cd6a1a03baa67e36f813d6cd991bd
>   Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
>   Date:   2012-03-20 (Tue, 20 Mar 2012)
>
>   Changed paths:
>     R scripts/scanreplace.pyc
>   R site_scons/site_tools/qt4/__init__.pyc
>   R yadeSCons.pyc
>
>   Log Message:
>   -----------
>   deleted *.pyc files
>
>
>   Commit: 01b02b9de976d7848729254777a4a38dd2c30957
>       https://github.com/yade/trunk/commit/01b02b9de976d7848729254777a4a38dd2c30957
>   Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
>   Date:   2012-03-20 (Tue, 20 Mar 2012)
>
>   Changed paths:
>     M .gitignore
>   M doc/sphinx/installation.rst
>   M doc/sphinx/templates/index.html
>   M yadeSCons.py
>
>   Log Message:
>   -----------
>   Merge remote branch 'upstream/master'
>
>
>   Commit: 09acb060c7d3e6249732e14dd71c655f84cd72be
>       https://github.com/yade/trunk/commit/09acb060c7d3e6249732e14dd71c655f84cd72be
>   Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
>   Date:   2012-03-21 (Wed, 21 Mar 2012)
>
>   Changed paths:
>     M yadeSCons.py
>
>   Log Message:
>   -----------
>   Merge remote branch 'upstream/master'
>
>
>   Commit: f2c794d81aadfb7211f542cbc4e737ed460c7d0d
>       https://github.com/yade/trunk/commit/f2c794d81aadfb7211f542cbc4e737ed460c7d0d
>   Author: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
>   Date:   2012-03-21 (Wed, 21 Mar 2012)
>
>   Changed paths:
>     M pkg/common/ResetRandomPosition.hpp
>
>   Log Message:
>   -----------
>   Merge remote branch 'upstream/master'
>
>
>   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.
>
>
> Compare: https://github.com/yade/trunk/compare/2ae187f^...1025779
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-dev
> Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev
> More help   : https://help.launchpad.net/ListHelp


-- 
_______________
Bruno Chareyre
Associate Professor
ENSE³ - Grenoble INP
11, rue des Mathématiques
BP 46
38402 St Martin d'Hères, France
Tél : +33 4 56 52 86 21
Fax : +33 4 76 82 70 43
________________


Follow ups

References