[yade] 01/06: Merge tag 'upstream/1.07.0'

Anton Gladky gladk at moszumanska.debian.org
Mon Jan 13 19:14:06 UTC 2014


This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository yade.

commit 72426aecf1363751a0729db279f3d09d47a63b78
Merge: 4060631 d42c7de
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Jan 13 19:53:27 2014 +0100

    Merge tag 'upstream/1.07.0'
    
    Upstream version 1.07.0

 CMakeLists.txt                                     |  40 ++++--
 ChangeLog                                          | 127 ++++++++++++++++---
 README.rst                                         |   5 +-
 RELEASE                                            |   2 +-
 core/main/main.py.in                               |  10 +-
 core/main/yade-batch.in                            |   7 ++
 doc/references.bib                                 |  42 +++++--
 doc/sphinx/formulation.rst                         |  14 ++-
 doc/sphinx/installation.rst                        |  88 ++++++++++----
 doc/sphinx/user.rst                                |   2 +-
 doc/yade-articles.bib                              |  15 ++-
 examples/baraban/BicyclePedalEngine.py             |  62 ++++++++++
 examples/clumps/addToClump-example.py              |   4 +
 .../{addToClump-example.py => save-load-clumps.py} |  24 ++--
 examples/concrete/triax.py                         |   7 +-
 examples/jointedCohesiveFrictionalPM/gravityBis.py |  11 +-
 .../jointedCohesiveFrictionalPM/gravityLoading.py  |  14 +--
 examples/jointedCohesiveFrictionalPM/identifBis.py |  91 +++++++-------
 .../identificationSpheresOnJoint.py                | 120 +++++++++---------
 .../jointedCohesiveFrictionalPM/testingJoint.py    | 135 +++++++++++++++++++++
 examples/packs/packs.py                            |  11 +-
 examples/stl-gts/README                            |   7 ++
 examples/stl-gts/cone.geo                          |  38 ++++++
 examples/stl-gts/convert2stl.sh                    |   3 +
 examples/stl-gts/gts-stl.py                        |  42 +++++++
 examples/tetra/oneTetra.py                         |   2 +-
 examples/triax-tutorial/script-session1.py         |   1 +
 gui/qt4/GLViewerMouse.cpp                          |  42 ++++---
 gui/qt4/__init__.py                                |  11 +-
 lib/triangulation/FlowBoundingSphere.ipp           |   3 +-
 lib/triangulation/FlowBoundingSphereLinSolv.ipp    |   3 +-
 lib/triangulation/PeriodicFlow.cpp                 |   1 -
 lib/triangulation/def_types.h                      |   3 +
 pkg/common/Grid.cpp                                |  61 ----------
 pkg/common/Grid_GUI.cpp                            |  67 ++++++++++
 pkg/common/KinematicEngines.cpp                    |  33 ++++-
 pkg/common/KinematicEngines.hpp                    |  12 ++
 pkg/dem/FlowEngine.cpp                             |  40 +++---
 pkg/dem/FlowEngine.hpp                             |  13 +-
 pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.cpp        |  33 +++--
 pkg/dem/JointedCohesiveFrictionalPM.cpp            | 106 ++++++++++------
 pkg/dem/JointedCohesiveFrictionalPM.hpp            |  75 ++++++------
 pkg/dem/Shop.hpp                                   |   4 +-
 pkg/dem/Shop_02.cpp                                |  13 ++
 pkg/dem/TesselationWrapper.hpp                     |   4 +-
 pkg/dem/VTKRecorder.cpp                            |  74 ++++++++---
 pkg/dem/VTKRecorder.hpp                            |   3 +-
 pkg/dem/ViscoelasticPM.cpp                         |  68 +++++++----
 pkg/dem/ViscoelasticPM.hpp                         |  15 ++-
 py/_extraDocs.py                                   |   6 +-
 py/_utils.cpp                                      |  61 +++++-----
 py/export.py                                       |  47 ++++++-
 py/pack/pack.py                                    |   6 +-
 py/utils.py                                        |   2 +-
 py/ymport.py                                       |  40 ++++++
 scripts/checks-and-tests/checks/DEM-PFV-check.py   |  11 +-
 scripts/checks-and-tests/checks/checkViscElEng.py  |  59 +++++++++
 scripts/checks-and-tests/checks/checkWeight.py     |   2 +-
 scripts/ppa/.dput.cf                               |   6 +
 scripts/ppa/.mini-dinstall.conf                    |  21 ++++
 scripts/ppa/buildppa.py                            | 120 ++++++++++++++++++
 scripts/ppa/ppa.config                             |  31 +++++
 62 files changed, 1532 insertions(+), 488 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yade.git



More information about the debian-science-commits mailing list