[yade] 01/04: Merge tag 'upstream/1.05.0'

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository yade.

commit 862dacbbefb735b7cfa4321eafc9d488fd272a9f
Merge: 72c496c 8448883
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Oct 28 20:46:08 2013 +0100

    Merge tag 'upstream/1.05.0'
    
    Upstream version 1.05.0

 .gitignore                                         |    5 +-
 CMakeLists.txt                                     |    8 +-
 ChangeLog                                          |   76 ++
 RELEASE                                            |    2 +-
 core/Clump.cpp                                     |   26 +-
 core/Clump.hpp                                     |    2 +-
 core/Scene.hpp                                     |    4 +-
 doc/references.bib                                 |   11 +
 doc/sphinx/installation.rst                        |   26 +-
 doc/sphinx/references.bib                          |   11 +
 doc/sphinx/user.rst                                |  105 +--
 doc/sphinx/yadeSphinx.py                           |    2 +-
 examples/LudingPM.py                               |   97 ++-
 examples/clumps/apply-buoyancy-clumps.py           |  125 ++-
 examples/clumps/replaceByClumps-example.py         |    4 +-
 examples/jointedCohesiveFrictionalPM/README        |    3 +
 examples/jointedCohesiveFrictionalPM/gravityBis.py |  128 +++
 ...entificationSpheresOnJoint.py => identifBis.py} |  144 ++--
 .../identificationSpheresOnJoint.py                |    2 +-
 examples/packs/packs.py                            |    2 +-
 examples/polyhedra/ball.py                         |   47 ++
 examples/polyhedra/free-fall.py                    |   58 ++
 examples/polyhedra/irregular.py                    |   63 ++
 examples/polyhedra/wall.py                         |   72 ++
 examples/test/unstructuredGrid.py                  |   38 +
 examples/test/vtkPeriodicCell.py                   |   23 +
 examples/{polyhedra => tetra}/oneTetra.py          |    2 +-
 .../oneTetra.py => tetra/oneTetraPoly.py}          |    4 +-
 examples/{polyhedra => tetra}/twoTetras.py         |    1 -
 .../twoTetras.py => tetra/twoTetrasPoly.py}        |   21 +-
 gui/CMakeLists.txt                                 |    2 +-
 gui/qt4/GLViewer.cpp                               |  331 +-------
 gui/qt4/GLViewerDisplay.cpp                        |  296 +++++++
 gui/qt4/GLViewerMouse.cpp                          |  112 +++
 lib/pyutil/README                                  |    2 +-
 lib/pyutil/numpy_boost.hpp                         |  119 ++-
 lib/triangulation/FlowBoundingSphere.hpp           |    7 +
 pkg/common/KinematicEngines.cpp                    |    1 +
 pkg/dem/ConcretePM.cpp                             |   14 +-
 pkg/dem/FlowEngine.cpp                             |   43 +-
 pkg/dem/FlowEngine.hpp                             |   52 ++
 pkg/dem/JointedCohesiveFrictionalPM.cpp            |   20 +-
 pkg/dem/JointedCohesiveFrictionalPM.hpp            |    4 +-
 pkg/dem/LudingPM.cpp                               |   69 +-
 pkg/dem/LudingPM.hpp                               |    9 +-
 pkg/dem/Polyhedra.cpp                              |  427 ++++++++++
 pkg/dem/Polyhedra.hpp                              |  274 +++++++
 pkg/dem/Polyhedra_Ig2.cpp                          |  305 ++++++++
 pkg/dem/Polyhedra_Ig2.hpp                          |   71 ++
 pkg/dem/Polyhedra_splitter.cpp                     |  109 +++
 pkg/dem/Polyhedra_splitter.hpp                     |   33 +
 pkg/dem/Polyhedra_support.cpp                      |  817 ++++++++++++++++++++
 pkg/dem/Shop.hpp                                   |    8 +-
 pkg/dem/Shop_01.cpp                                |  455 +++++++++++
 pkg/dem/{Shop.cpp => Shop_02.cpp}                  |  400 +---------
 pkg/dem/TesselationWrapper.hpp                     |    2 +-
 pkg/dem/Tetra.cpp                                  |    4 +-
 pkg/dem/VTKRecorder.cpp                            |  190 ++++-
 pkg/dem/VTKRecorder.hpp                            |    4 +-
 py/CMakeLists.txt                                  |    6 +
 py/_polyhedra_utils.cpp                            |  374 +++++++++
 py/_utils.cpp                                      |    4 +-
 py/export.py                                       |   35 +-
 py/polyhedra_utils.py                              |  102 +++
 py/utils.py                                        |   68 +-
 py/wrapper/yadeWrapper.cpp                         |   32 +-
 66 files changed, 4778 insertions(+), 1135 deletions(-)

diff --cc .gitignore
index e7b4760,0da8374..a0f3400
--- a/.gitignore
+++ b/.gitignore
@@@ -25,8 -25,8 +25,9 @@@ doc/sphinx/yade.timing.rs
  doc/sphinx/yade.utils.rst
  doc/sphinx/yade.wrapper.rst
  doc/sphinx/yade.ymport.rst
- .kdev4/yade.kdev4
- yade.kdev4
+ doc/sphinx/yade.polyhedra_utils.rst
+ .kdev4/
+ *.kdev4
  *.pyc
  
 +.pc

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