[yade] 01/05: Merge tag 'upstream/1.11.0'

Anton Gladky gladk at moszumanska.debian.org
Thu Aug 7 18:51:43 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 1da153fde0bf715f36ded9769f73aab9c5aab7c3
Merge: a287c09 a0600ae
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Aug 4 19:15:03 2014 +0200

    Merge tag 'upstream/1.11.0'
    
    Upstream version 1.11.0

 CMakeLists.txt                                     |  30 +-
 ChangeLog                                          | 117 ++++
 LICENSE                                            |  47 +-
 NEWS                                               | 198 ------
 RELEASE                                            |   2 +-
 core/Body.cpp                                      |   1 -
 core/Body.hpp                                      |   2 -
 core/BodyContainer.cpp                             |  41 +-
 core/BodyContainer.hpp                             |  24 +-
 core/Bound.cpp                                     |  12 -
 core/Clump.cpp                                     |   1 -
 core/Clump.hpp                                     |   3 -
 core/Dispatcher.cpp                                |  18 -
 core/Dispatcher.hpp                                |   9 +-
 core/EnergyTracker.cpp                             |  12 -
 core/EnergyTracker.hpp                             |  20 +-
 core/Engine.cpp                                    |  13 -
 core/Engine.hpp                                    |  15 +-
 core/FileGenerator.cpp                             |   1 -
 core/ForceContainer.hpp                            |   2 -
 core/FrontEnd.cpp                                  |  21 -
 core/FrontEnd.hpp                                  |   4 +-
 core/Functor.hpp                                   |   6 +-
 core/InteractionContainer.hpp                      |   5 -
 core/Material.cpp                                  |   6 -
 core/Material.hpp                                  |   3 +-
 core/Omega.cpp                                     |  20 +-
 core/Omega.hpp                                     |  33 +-
 core/PartialEngine.cpp                             |  10 -
 core/Scene.cpp                                     |   5 +-
 core/Shape.cpp                                     |   2 -
 core/Shape.hpp                                     |   2 +-
 core/State.cpp                                     |   5 -
 core/ThreadRunner.cpp                              |   2 -
 core/TimeStepper.cpp                               |  29 -
 core/TimeStepper.hpp                               |   5 +-
 core/Timing.hpp                                    |   1 -
 core/corePlugins.cpp                               |   1 -
 core/main/main.py.in                               |   8 +-
 core/main/pyboot.cpp                               |   8 -
 doc/references.bib                                 |  10 +
 doc/sphinx/conf.py                                 |   2 +-
 doc/sphinx/installation.rst                        |  33 +-
 doc/sphinx/user.rst                                |  11 +-
 doc/yade-conferences.bib                           |  20 +
 examples/bouncingbubble.py                         |  20 +
 examples/gts-horse/gts-horse.py                    |   4 +-
 examples/stl-gts/gts-stl.py                        |   4 +-
 examples/triax-tutorial/script-session1.py         |   1 +
 gui/qt4/GLViewer.cpp                               |   5 +-
 gui/qt4/GLViewer.hpp                               |   5 +-
 gui/qt4/GLViewerDisplay.cpp                        |   9 +-
 gui/qt4/GLViewerMouse.cpp                          |   3 -
 gui/qt4/_GLViewer.cpp                              |   1 -
 lib/base/Logging.hpp                               |   2 +
 lib/base/Math.cpp                                  |   4 +-
 lib/base/Math.hpp                                  |  99 ++-
 lib/base/openmp-accu.hpp                           |   6 -
 lib/factory/ClassFactory.hpp                       |  25 +-
 lib/factory/DynLibManager.cpp                      |  11 -
 lib/factory/DynLibManager.hpp                      |  19 +-
 lib/import/STLReader.hpp                           |   2 -
 lib/import/utils.hpp                               |   5 +-
 lib/multimethods/DynLibDispatcher.hpp              |   3 -
 lib/multimethods/FunctorWrapper.hpp                |   1 -
 lib/multimethods/Indexable.cpp                     |  34 --
 lib/multimethods/Indexable.hpp                     |  14 +-
 lib/opengl/GLUtils.hpp                             |   1 -
 lib/pyutil/doc_opts.hpp                            |   1 -
 lib/pyutil/numpy_boost.hpp                         |   1 -
 lib/pyutil/raw_constructor.hpp                     |   1 -
 lib/serialization/Serializable.hpp                 |  46 +-
 lib/smoothing/WeightedAverage2d.hpp                |  31 +-
 lib/triangulation/FlowBoundingSphere.hpp           |   1 -
 lib/triangulation/FlowBoundingSphere.ipp           |  18 +-
 lib/triangulation/FlowBoundingSphereLinSolv.hpp    |   2 -
 lib/triangulation/FlowBoundingSphereLinSolv.ipp    |   4 +-
 .../KinematicLocalisationAnalyser.cpp              |  18 +-
 .../KinematicLocalisationAnalyser.hpp              |   4 +
 lib/triangulation/Network.ipp                      |   4 +-
 lib/triangulation/PeriodicFlowLinSolv.hpp          |   2 -
 lib/triangulation/PeriodicFlowLinSolv.ipp          |   4 +-
 lib/triangulation/Tenseur3.cpp                     |   2 -
 lib/triangulation/Tenseur3.h                       |   5 +
 lib/triangulation/Tesselation.ipp                  |  11 +-
 lib/triangulation/Timer.cpp                        |   2 -
 lib/triangulation/Timer.h                          |   2 +
 lib/triangulation/TriaxialState.cpp                |   2 +-
 lib/triangulation/TriaxialState.h                  |   4 +-
 lib/triangulation/basicVTKwritter.cpp              |   2 -
 lib/triangulation/basicVTKwritter.hpp              |   5 +
 pkg/common/Aabb.cpp                                |  13 -
 pkg/common/Aabb.hpp                                |   4 +-
 pkg/common/Bo1_Aabb.cpp                            |  87 +++
 pkg/common/Bo1_Aabb.hpp                            |  66 ++
 pkg/common/Bo1_Box_Aabb.cpp                        |  35 --
 pkg/common/Bo1_Box_Aabb.hpp                        |  24 -
 pkg/common/Bo1_Facet_Aabb.cpp                      |  43 --
 pkg/common/Bo1_Facet_Aabb.hpp                      |  21 -
 pkg/common/Bo1_Sphere_Aabb.cpp                     |  38 --
 pkg/common/Bo1_Sphere_Aabb.hpp                     |  26 -
 pkg/common/BoundaryController.cpp                  |   4 -
 pkg/common/BoundaryController.hpp                  |   4 +-
 pkg/common/Box.cpp                                 |  15 -
 pkg/common/Box.hpp                                 |   2 +-
 pkg/common/Callbacks.cpp                           |  13 -
 pkg/common/Callbacks.hpp                           |   5 +-
 pkg/common/Collider.cpp                            |   2 +-
 pkg/common/CylScGeom6D.cpp                         |  24 -
 pkg/common/CylScGeom6D.hpp                         |  16 +-
 pkg/common/Cylinder.cpp                            |  48 +-
 pkg/common/Cylinder.hpp                            |  10 +-
 pkg/common/Dispatching.cpp                         |   4 +-
 pkg/common/Dispatching.hpp                         |   2 +-
 pkg/common/ElastMat.cpp                            |   5 -
 pkg/common/ElastMat.hpp                            |   6 +-
 pkg/common/FieldApplier.cpp                        |   5 -
 pkg/common/FieldApplier.hpp                        |   8 +-
 pkg/common/ForceResetter.cpp                       |  10 -
 pkg/common/ForceResetter.hpp                       |   6 +-
 pkg/common/GLDrawFunctors.cpp                      |   7 -
 pkg/common/Gl1_Aabb.cpp                            |  33 -
 pkg/common/Gl1_Aabb.hpp                            |  22 -
 pkg/common/Gl1_Box.cpp                             |  29 -
 pkg/common/Gl1_Box.hpp                             |  23 -
 pkg/common/Gl1_Facet.cpp                           |  61 --
 pkg/common/Gl1_Facet.hpp                           |  26 -
 pkg/common/Gl1_NormPhys.cpp                        |   2 +-
 pkg/common/{Gl1_Sphere.cpp => Gl1_Primitives.cpp}  | 131 ++--
 pkg/common/{Gl1_Sphere.hpp => Gl1_Primitives.hpp}  |  45 +-
 pkg/common/GravityEngines.cpp                      |   4 +-
 pkg/common/Grid.cpp                                |  71 ++-
 pkg/common/Grid.hpp                                |   8 +-
 pkg/common/InsertionSortCollider.cpp               |   8 +-
 pkg/common/InteractionLoop.cpp                     |   3 +-
 pkg/common/KinematicEngines.cpp                    |   4 +-
 pkg/common/MatchMaker.cpp                          |   7 +-
 pkg/common/MatchMaker.hpp                          |   3 +-
 pkg/common/NormShearPhys.cpp                       |   8 -
 pkg/common/NormShearPhys.hpp                       |   4 +-
 pkg/common/OpenGLRenderer.cpp                      |   2 +
 pkg/common/ParallelEngine.cpp                      |   6 +-
 pkg/common/ParallelEngine.hpp                      |   1 -
 pkg/common/PeriodicEngines.cpp                     |   3 -
 pkg/common/PeriodicEngines.hpp                     |  43 +-
 pkg/common/PersistentTriangulationCollider.cpp     |   6 -
 pkg/common/PersistentTriangulationCollider.hpp     |   4 -
 pkg/common/PyRunner.cpp                            |   2 -
 pkg/common/PyRunner.hpp                            |   1 -
 pkg/common/Recorder.cpp                            |  15 -
 pkg/common/Recorder.hpp                            |  15 +-
 pkg/common/ResetRandomPosition.cpp                 |   1 -
 pkg/common/ResetRandomPosition.hpp                 |   2 -
 pkg/common/SpatialQuickSortCollider.cpp            |   2 +-
 pkg/common/SpatialQuickSortCollider.hpp            |   2 -
 pkg/common/Sphere.cpp                              |   3 -
 pkg/common/Sphere.hpp                              |   2 +-
 pkg/common/StepDisplacer.cpp                       |  24 -
 pkg/common/StepDisplacer.hpp                       |  22 +-
 pkg/common/TorqueEngine.cpp                        |  12 -
 pkg/common/TorqueEngine.hpp                        |  10 +-
 pkg/common/Wall.cpp                                |   1 -
 pkg/common/ZECollider.cpp                          |   8 +-
 pkg/common/ZECollider.hpp                          |   6 -
 pkg/common/common.cpp                              |  31 +
 pkg/dem/BubbleMat.cpp                              |  79 ++-
 pkg/dem/BubbleMat.hpp                              |  18 +-
 pkg/dem/CapillaryPhys.cpp                          |  37 +-
 pkg/dem/CapillaryPhys.hpp                          |  15 +-
 pkg/dem/CapillaryStressRecorder.cpp                |   1 -
 pkg/dem/CapillaryTriaxialTest.cpp                  |  34 +-
 pkg/dem/CohFrictMat.cpp                            |  19 -
 pkg/dem/CohFrictMat.hpp                            |  40 --
 pkg/dem/CohFrictPhys.cpp                           |  23 -
 pkg/dem/CohFrictPhys.hpp                           |  47 --
 pkg/dem/CohesiveFrictionalContactLaw.cpp           |  84 ++-
 pkg/dem/CohesiveFrictionalContactLaw.hpp           |  89 ++-
 pkg/dem/CohesiveTriaxialTest.cpp                   |  35 +-
 pkg/dem/ConcretePM.cpp                             |  14 +-
 pkg/dem/ConcretePM.hpp                             |   4 +-
 pkg/dem/DemXDofGeom.cpp                            |   3 -
 pkg/dem/DemXDofGeom.hpp                            |   2 +-
 pkg/dem/DomainLimiter.cpp                          |   5 +-
 pkg/dem/ElasticContactLaw.cpp                      |  11 +-
 pkg/dem/ElasticContactLaw.hpp                      |   7 +-
 pkg/dem/FacetTopologyAnalyzer.cpp                  |   8 +-
 pkg/dem/FlatGridCollider.cpp                       |   2 +-
 pkg/dem/FlatGridCollider.hpp                       |   1 -
 pkg/dem/FrictPhys.cpp                              |  71 ++-
 pkg/dem/FrictPhys.hpp                              |  32 +-
 pkg/dem/FrictViscoPM.cpp                           |   6 +-
 pkg/dem/FrictViscoPM.hpp                           |   5 +-
 pkg/dem/GeneralIntegratorInsertionSortCollider.cpp |   6 +-
 pkg/dem/HertzMindlin.cpp                           | 106 +++-
 pkg/dem/HertzMindlin.hpp                           |  89 ++-
 pkg/dem/Ig2_Box_Sphere_ScGeom.cpp                  |   6 +-
 pkg/dem/Ig2_Facet_Sphere_ScGeom.cpp                |   4 +-
 pkg/dem/InelastCohFrictMat.cpp                     |   7 -
 pkg/dem/InelastCohFrictMat.hpp                     |  50 --
 ...ys_CohesionMoment.cpp => InelastCohFrictPM.cpp} |  95 ++-
 ...elastCohFrictPhys.hpp => InelastCohFrictPM.hpp} |  79 ++-
 pkg/dem/InelastCohFrictPhys.cpp                    |  13 -
 pkg/dem/Integrator.cpp                             |   3 +-
 pkg/dem/Integrator.hpp                             |   1 -
 ...p2_2xInelastCohFrictMat_InelastCohFrictPhys.cpp |  72 ---
 ...p2_2xInelastCohFrictMat_InelastCohFrictPhys.hpp |  32 -
 ...2xNormalInelasticMat_NormalInelasticityPhys.cpp |  69 ---
 ...2xNormalInelasticMat_NormalInelasticityPhys.hpp |  38 --
 .../Ip2_CohFrictMat_CohFrictMat_CohFrictPhys.cpp   |  89 ---
 .../Ip2_CohFrictMat_CohFrictMat_CohFrictPhys.hpp   |  34 --
 pkg/dem/Ip2_ElastMat.cpp                           |   1 -
 pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.cpp    |  56 --
 pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp    |  29 -
 pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.cpp        |  86 ---
 pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp        |  38 --
 .../Ip2_FrictMat_FrictMat_MindlinCapillaryPhys.cpp |  95 ---
 .../Ip2_FrictMat_FrictMat_MindlinCapillaryPhys.hpp |  65 --
 pkg/dem/JointedCohesiveFrictionalPM.cpp            |  19 +-
 pkg/dem/JointedCohesiveFrictionalPM.hpp            |   4 +-
 pkg/dem/KinemCNDEngine.cpp                         |  53 --
 pkg/dem/KinemCNDEngine.hpp                         |  38 --
 pkg/dem/KinemCNLEngine.cpp                         |  61 --
 pkg/dem/KinemCNLEngine.hpp                         |  43 --
 pkg/dem/KinemCNSEngine.cpp                         |  51 --
 pkg/dem/KinemCNSEngine.hpp                         |  41 --
 pkg/dem/KinemCTDEngine.cpp                         |  73 ---
 pkg/dem/KinemCTDEngine.hpp                         |  41 --
 pkg/dem/KinemC__Engine.cpp                         | 169 ++++++
 pkg/dem/KinemC__Engine.hpp                         | 108 ++++
 pkg/dem/KinemSimpleShearBox.cpp                    |   4 +-
 pkg/dem/L3Geom.cpp                                 |  22 +-
 pkg/dem/L3Geom.hpp                                 |   4 +-
 ...ScGeom6D_InelastCohFrictPhys_CohesionMoment.hpp |  26 -
 pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp  |   8 +-
 pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp  |   8 -
 pkg/dem/LudingPM.cpp                               |   7 +-
 pkg/dem/LudingPM.hpp                               |   2 +-
 pkg/dem/MicroMacroAnalyser.hpp                     |   4 -
 pkg/dem/NewtonIntegrator.cpp                       |   2 +-
 pkg/dem/NormalInelasticMat.cpp                     |  12 -
 pkg/dem/NormalInelasticMat.hpp                     |  32 -
 ...alInelasticityLaw.cpp => NormalInelasticPM.cpp} |  72 ++-
 pkg/dem/NormalInelasticPM.hpp                      | 114 ++++
 pkg/dem/NormalInelasticityLaw.hpp                  |  51 --
 pkg/dem/NormalInelasticityPhys.cpp                 |  18 -
 pkg/dem/NormalInelasticityPhys.hpp                 |  38 --
 pkg/dem/PeriIsoCompressor.cpp                      |  24 +-
 pkg/dem/PeriIsoCompressor.hpp                      |  10 +-
 pkg/dem/Polyhedra.cpp                              |  31 +-
 pkg/dem/Polyhedra.hpp                              |   3 +-
 pkg/dem/Polyhedra_splitter.cpp                     |   4 +-
 pkg/dem/Polyhedra_support.cpp                      |   8 +-
 pkg/dem/SampleCapillaryPressureEngine.cpp          |   3 -
 pkg/dem/Shop.hpp                                   |   9 +-
 pkg/dem/Shop_01.cpp                                |  23 +-
 pkg/dem/Shop_02.cpp                                |  53 +-
 pkg/dem/SimpleShear.cpp                            |  13 +-
 pkg/dem/SimpleShear.hpp                            |   3 -
 pkg/dem/SpherePack.cpp                             |   8 +-
 pkg/dem/SpherePack.hpp                             |  22 -
 pkg/dem/SpheresFactory.cpp                         |   2 +-
 pkg/dem/TesselationWrapper.cpp                     |  12 +-
 pkg/dem/TesselationWrapper.hpp                     |   4 -
 pkg/dem/Tetra.cpp                                  |  22 +-
 pkg/dem/Tetra.hpp                                  |   4 +-
 pkg/dem/ThreeDTriaxialEngine.cpp                   |   1 -
 pkg/dem/ThreeDTriaxialEngine.hpp                   |   3 -
 pkg/dem/TriaxialCompressionEngine.cpp              |   7 +-
 pkg/dem/TriaxialCompressionEngine.hpp              |   1 -
 pkg/dem/TriaxialStateRecorder.cpp                  |   1 -
 pkg/dem/TriaxialStressController.cpp               |  48 +-
 pkg/dem/TriaxialStressController.hpp               |   7 +-
 pkg/dem/TriaxialTest.cpp                           |  35 +-
 pkg/dem/UniaxialStrainer.cpp                       |   6 +-
 pkg/dem/UniaxialStrainer.hpp                       |   6 -
 pkg/dem/VTKRecorder.cpp                            | 270 +++++----
 pkg/dem/VTKRecorder.hpp                            |   4 +-
 pkg/dem/ViscoelasticCapillarPM.cpp                 |  12 +-
 pkg/dem/ViscoelasticCapillarPM.hpp                 |   2 +-
 pkg/dem/ViscoelasticPM.cpp                         |  18 +-
 pkg/dem/ViscoelasticPM.hpp                         |   2 +-
 pkg/dem/WirePM.cpp                                 |  13 +-
 pkg/dem/WirePM.hpp                                 |   2 +-
 pkg/lbm/HydrodynamicsLawLBM.cpp                    |  12 +-
 pkg/lbm/LBMbody.cpp                                |  16 -
 pkg/lbm/LBMbody.hpp                                |   2 +-
 pkg/lbm/LBMlink.cpp                                |  17 -
 pkg/lbm/LBMlink.hpp                                |  11 +-
 pkg/lbm/LBMnode.cpp                                |   6 +-
 pkg/pfv/FlowEngine.hpp.in                          |   3 +-
 pkg/pfv/FlowEngine.ipp.in                          |  36 +-
 pkg/pfv/PeriodicFlowEngine.cpp                     |   6 +-
 pkg/pfv/SoluteFlowEngine.cpp                       |  16 +-
 py/3rd-party/README                                |   6 +-
 py/3rd-party/mtTkinter-0.4/gpl.txt                 | 674 +++++++++++++++++++++
 py/3rd-party/mtTkinter-0.4/lgpl.txt                | 165 +++++
 .../{mtTkinter-0.3 => mtTkinter-0.4}/mtTkinter.py  |  15 +
 py/CMakeLists.txt                                  |   2 +-
 py/_polyhedra_utils.cpp                            |  15 +-
 py/_utils.cpp                                      |  13 +-
 py/export.py                                       |   1 +
 py/mathWrap/miniEigen.cpp                          |  10 +-
 py/pack/_packObb.cpp                               |  11 -
 py/pack/_packPredicates.cpp                        |  15 +-
 py/tests/__init__.py                               |   6 +-
 py/utils.py                                        |  35 +-
 py/wrapper/customConverters.cpp                    |  28 -
 py/wrapper/yadeWrapper.cpp                         |  37 +-
 scripts/checks-and-tests/checks/DEM-PFV-check.py   |   7 +-
 scripts/checks-and-tests/checks/checkList.py       |   2 +-
 310 files changed, 3452 insertions(+), 3930 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