[yade] 01/04: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Wed Aug 31 04:51:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch jessie-backports
in repository yade.
commit c09d19d1866e4d8e14c5a427548ac4c2ee120299
Merge: 3cc2b90 845cc42
Author: Anton Gladky <gladk at debian.org>
Date: Tue Aug 30 23:13:11 2016 +0200
Merge.
.gitattributes | 2 +
.gitignore | 1 +
.travis.yml | 26 +
CMakeLists.txt | 38 +-
ChangeLog | 210 ++
RELEASE | 2 +-
...FindQGLVIEWER.cmake => FindQGLVIEWER-qt4.cmake} | 3 +-
...FindQGLVIEWER.cmake => FindQGLVIEWER-qt5.cmake} | 5 +-
core/Body.cpp | 4 +-
core/Body.hpp | 26 +-
core/BodyContainer.cpp | 9 +-
core/BodyContainer.hpp | 31 +-
core/Dispatcher.hpp | 67 +-
core/ForceContainer.hpp | 309 +--
core/ForceContainerParallel.cpp | 252 +++
core/ForceContainerSerial.cpp | 157 ++
core/Functor.hpp | 3 -
core/Interaction.cpp | 3 +
core/Interaction.hpp | 7 +-
core/InteractionContainer.cpp | 22 +-
core/InteractionContainer.hpp | 18 +-
core/Omega.cpp | 58 +-
core/Omega.hpp | 2 -
core/Scene.cpp | 35 +-
core/Scene.hpp | 36 +-
core/Shape.hpp | 6 +-
core/SimulationFlow.cpp | 5 +-
core/SimulationFlow.hpp | 3 +-
core/State.cpp | 42 +-
core/State.hpp | 17 +-
core/ThreadRunner.cpp | 3 -
core/TimeStepper.hpp | 2 -
core/corePlugins.cpp | 14 +-
core/main/yade-batch.in | 7 -
debian/changelog | 84 +
debian/control | 22 +-
debian/copyright | 2 +-
debian/patches/01_remove_google_analytics.patch | 6 +-
debian/patches/05_reproducible-builds.patch | 192 ++
debian/patches/06_fixCrash.patch | 26 +
debian/patches/series | 2 +
debian/rules | 20 +-
debian/tests/control | 2 +
debian/yade.menu | 8 -
doc/citing_yade.bib | 76 +-
doc/references.bib | 70 +-
doc/sphinx/FEMxDEM.rst | 1 +
doc/sphinx/README | 8 +
doc/sphinx/{conf.py => book/confBook.py} | 119 +-
doc/sphinx/{conf.py => book/confManual.py} | 98 +-
doc/sphinx/{conf.py => book/confReference.py} | 98 +-
doc/sphinx/{conf.py => book/confTheory.py} | 96 +-
doc/sphinx/book/fullBibliography.rst.in | 6 +
doc/sphinx/citing.rst | 18 +-
doc/sphinx/conf.py | 16 +-
doc/sphinx/consulting.rst | 10 +
doc/sphinx/formulation.rst | 4 +-
doc/sphinx/github.rst | 13 +-
doc/sphinx/index-toctree-book.rst | 19 +
doc/sphinx/index-toctree-manuals.rst | 25 +
doc/sphinx/index-toctree-reference.rst | 11 +
doc/sphinx/index-toctree-theory.rst | 9 +
doc/sphinx/index-toctree_manuals.rst | 26 +
doc/sphinx/installation.rst | 163 +-
doc/sphinx/introduction.rst | 36 +-
doc/sphinx/templates/index.html | 31 +-
doc/sphinx/tutorial-hands-on.rst | 4 +-
doc/sphinx/user.rst | 8 +-
doc/sphinx/{yadeSphinx.py => yadeBookSphinx.py} | 155 +-
doc/sphinx/yadeSphinx.py | 2 +-
doc/yade-articles.bib | 63 +-
doc/yade-conferences.bib | 20 +-
doc/yade-docref.bib | 73 +-
doc/yade-theses.bib | 8 +
examples/FluidCouplingPFV/oedometer.py | 2 +-
examples/{LudingPM.py => LudingPM/LudingPM_1.py} | 0
examples/LudingPM/LudingPM_2.py | 73 +
examples/LudingPM/README | 2 +
examples/PotentialParticles/basic.py | 85 +
examples/PotentialParticles/cubePPscaled.py | 258 +++
examples/agglomerate/README | 14 +
examples/agglomerate/compress.py | 59 +
examples/agglomerate/divide.py | 36 +
examples/agglomerate/makeCloud.py | 22 +
examples/agglomerate/simulation.py | 53 +
.../chained-cylinders/CohesiveCylinderSphere.py | 27 +-
.../chained-cylinders/chained-cylinder-roots.py | 1 +
.../chained-cylinders/chained-cylinder-spring.py | 2 +
examples/clumps/apply-buoyancy-clumps.py | 4 +-
examples/concrete/periodic.py | 4 +-
examples/cylinders/bendingbeams.py | 62 +
examples/cylinders/cylinder-cylinder.py | 63 +
examples/cylinders/cylinderconnection-roots.py | 97 +
examples/cylinders/mikado.py | 82 +
examples/deformableelem/Minimal.py | 98 +
examples/deformableelem/MinimalTensileTest.py | 206 ++
examples/deformableelem/ReadMe | 1 +
examples/deformableelem/main.py | 38 +
examples/deformableelem/model.geo | 5 +
examples/deformableelem/model.msh | 2188 ++++++++++++++++++++
examples/deformableelem/model.stl | 870 ++++++++
examples/deformableelem/testDeformableBodies.py | 151 ++
.../testDeformableBodies_pressure.py | 199 ++
examples/grids/CohesiveGridConnectionSphere.py | 77 +
examples/grids/GridConnection_Spring.py | 83 +
examples/grids/Simple_GridConnection_Falling.py | 46 +
examples/grids/Simple_Grid_Falling.py | 1 +
examples/jointedCohesiveFrictionalPM/README | 7 +-
examples/mortar/modelTests/compression.py | 62 +
examples/mortar/modelTests/failureEnvelope.py | 61 +
examples/mortar/modelTests/shear.py | 97 +
examples/pfacet/box.gts | 39 +
examples/pfacet/gts-pfacet.py | 88 +
examples/pfacet/mesh-pfacet.py | 104 +
examples/pfacet/octahedron.gts | 1539 ++++++++++++++
examples/pfacet/pfacetcreators.py | 119 ++
examples/pfacet/sphere.gts | 243 +++
examples/pfacet/sphere.mesh | 253 +++
.../polyhedra/tests/interactinDetectionFactor.py | 27 +
examples/polyhedra/tests/scGeom.py | 28 +
examples/simple-scene/2SpheresNormVisc.py | 53 +
examples/test/clump-facet.py | 2 +-
gui/CMakeLists.txt | 2 +-
gui/qt4/GLViewer.cpp | 6 +-
gui/qt4/__init__.py | 9 -
gui/qt5/GLViewer.cpp | 6 +-
gui/qt5/Inspector.py | 16 +-
gui/qt5/SerializableEditor.py | 6 +-
gui/qt5/__init__.py | 9 -
lib/base/Logging.hpp | 28 +-
lib/base/Math.hpp | 13 +-
lib/base/openmp-accu.hpp | 5 -
lib/computational-geometry/MarchingCube.cpp | 557 +++++
lib/computational-geometry/MarchingCube.hpp | 71 +
lib/factory/ClassFactory.cpp | 19 -
lib/factory/ClassFactory.hpp | 21 +-
lib/factory/DynLibManager.hpp | 2 -
lib/multimethods/DynLibDispatcher.hpp | 528 +----
lib/multimethods/FunctorWrapper.hpp | 6 -
lib/multimethods/Indexable.hpp | 4 +-
lib/opengl/GLUtils.cpp | 1 -
lib/opengl/OpenGLWrapper.hpp | 14 +
lib/pyutil/numpy.hpp | 7 -
lib/pyutil/raw_constructor.hpp | 38 +-
lib/serialization/ObjectIO.hpp | 20 +-
lib/smoothing/LinearInterpolate.hpp | 16 -
lib/triangulation/FlowBoundingSphere.ipp | 4 +-
.../KinematicLocalisationAnalyser.cpp | 6 +-
lib/triangulation/PeriodicFlow.hpp | 2 +-
lib/triangulation/Timer.cpp | 2 +-
lib/triangulation/TriaxialState.cpp | 2 +-
pkg/common/Collider.cpp | 11 -
pkg/common/Collider.hpp | 5 -
pkg/common/Cylinder.cpp | 4 +-
pkg/common/Dispatching.cpp | 11 +-
pkg/common/Dispatching.hpp | 2 -
pkg/common/Facet.cpp | 2 +-
pkg/common/ForceEngine.cpp | 225 +-
pkg/common/ForceEngine.hpp | 14 +
pkg/common/Gl1_NormPhys.cpp | 2 +-
pkg/common/Gl1_PFacet.cpp | 57 +
pkg/common/Gl1_PFacet.hpp | 21 +
pkg/common/Gl1_PotentialParticle.cpp | 606 ++++++
pkg/common/Gl1_PotentialParticle.hpp | 164 ++
pkg/common/Grid.cpp | 45 +-
pkg/common/Grid.hpp | 55 +-
pkg/common/InsertionSortCollider.cpp | 34 +-
pkg/common/InsertionSortCollider.hpp | 27 +-
pkg/common/InteractionLoop.cpp | 47 +-
pkg/common/MatchMaker.cpp | 27 +-
pkg/common/MatchMaker.hpp | 11 +-
pkg/common/NormShearPhys.hpp | 4 +-
pkg/common/OpenGLRenderer.cpp | 59 +-
pkg/common/OpenGLRenderer.hpp | 11 +-
pkg/common/PFacet.cpp | 838 ++++++++
pkg/common/PFacet.hpp | 140 ++
pkg/common/PersistentTriangulationCollider.cpp | 2 -
pkg/common/SpatialQuickSortCollider.cpp | 2 -
pkg/common/ZECollider.cpp | 4 +-
pkg/dem/CohesiveFrictionalContactLaw.cpp | 21 +-
pkg/dem/CohesiveFrictionalContactLaw.hpp | 25 +-
pkg/dem/ConcretePM.cpp | 51 +-
pkg/dem/ConcretePM.hpp | 6 +-
pkg/dem/Disp2DPropLoadEngine.cpp | 1 +
pkg/dem/GeneralIntegratorInsertionSortCollider.cpp | 7 +-
pkg/dem/Ig2_PP_PP_ScGeom.cpp | 1896 +++++++++++++++++
pkg/dem/Ig2_PP_PP_ScGeom.hpp | 121 ++
pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp | 5 +-
pkg/dem/JointedCohesiveFrictionalPM.hpp | 2 +-
pkg/dem/KnKsLaw.cpp | 311 +++
pkg/dem/KnKsLaw.hpp | 189 ++
pkg/dem/L3Geom.cpp | 85 +-
pkg/dem/L3Geom.hpp | 11 +-
pkg/dem/LudingPM.hpp | 4 +-
pkg/dem/MicroMacroAnalyser.cpp | 17 +-
pkg/dem/MortarMat.cpp | 120 ++
pkg/dem/MortarMat.hpp | 92 +
pkg/dem/NewtonIntegrator.cpp | 6 +-
pkg/dem/PeriIsoCompressor.cpp | 2 +-
pkg/dem/Polyhedra.cpp | 228 +-
pkg/dem/Polyhedra.hpp | 45 +-
pkg/dem/Polyhedra_Ig2.cpp | 291 ++-
pkg/dem/Polyhedra_Ig2.hpp | 84 +-
pkg/dem/Polyhedra_splitter.cpp | 94 +-
pkg/dem/Polyhedra_splitter.hpp | 8 +-
pkg/dem/Polyhedra_support.cpp | 435 ++--
pkg/dem/PotentialParticle.cpp | 13 +
pkg/dem/PotentialParticle.hpp | 70 +
pkg/dem/PotentialParticle2AABB.cpp | 73 +
pkg/dem/PotentialParticle2AABB.hpp | 25 +
pkg/dem/ScGeom.cpp | 4 +-
pkg/dem/Shop.hpp | 6 +-
pkg/dem/Shop_01.cpp | 7 +-
pkg/dem/Shop_02.cpp | 58 +-
pkg/dem/SimpleShear.cpp | 2 +
pkg/dem/SpherePack.cpp | 81 +-
pkg/dem/TesselationWrapper.cpp | 21 +-
pkg/dem/TesselationWrapper.hpp | 1 +
pkg/dem/Tetra.cpp | 36 +-
pkg/dem/Tetra.hpp | 2 +-
pkg/dem/TriaxialStressController.cpp | 24 +-
pkg/dem/TriaxialStressController.hpp | 10 +-
pkg/dem/UniaxialStrainer.cpp | 14 +-
pkg/dem/VTKRecorder.cpp | 30 +-
pkg/dem/ViscoelasticCapillarPM.cpp | 28 +-
pkg/dem/ViscoelasticCapillarPM.hpp | 15 +-
pkg/dem/ViscoelasticPM.cpp | 4 +-
pkg/dem/ViscoelasticPM.hpp | 2 +
pkg/dem/WirePM.hpp | 2 +-
.../Bo1_DeformableElement_Aabb.cpp | 77 +
.../Bo1_DeformableElement_Aabb.hpp | 26 +
pkg/dem/deformablecohesive/Bo1_Node_Aabb.cpp | 38 +
pkg/dem/deformablecohesive/Bo1_Node_Aabb.hpp | 26 +
pkg/dem/deformablecohesive/CohesiveMat.cpp | 14 +
pkg/dem/deformablecohesive/CohesiveMat.hpp | 48 +
.../DeformableCohesiveElement.cpp | 54 +
.../DeformableCohesiveElement.hpp | 82 +
pkg/dem/deformablecohesive/DeformableElement.cpp | 103 +
pkg/dem/deformablecohesive/DeformableElement.hpp | 92 +
.../FEInternalForceDispatchers.cpp | 35 +
.../FEInternalForceDispatchers.hpp | 50 +
.../deformablecohesive/FEInternalForceEngine.cpp | 90 +
.../deformablecohesive/FEInternalForceEngine.hpp | 42 +
.../deformablecohesive/Gl1_DeformableElement.cpp | 98 +
.../deformablecohesive/Gl1_DeformableElement.hpp | 24 +
pkg/dem/deformablecohesive/Gl1_Node.cpp | 182 ++
pkg/dem/deformablecohesive/Gl1_Node.hpp | 40 +
...4NodeTetra_LinCohesiveStiffPropDampElastMat.cpp | 61 +
...4NodeTetra_LinCohesiveStiffPropDampElastMat.hpp | 39 +
.../If2_Lin4NodeTetra_LinIsoRayleighDampElast.cpp | 82 +
.../If2_Lin4NodeTetra_LinIsoRayleighDampElast.hpp | 39 +
pkg/dem/deformablecohesive/Lin4NodeTetra.cpp | 127 ++
pkg/dem/deformablecohesive/Lin4NodeTetra.hpp | 102 +
...4NodeTetra_Lin4NodeTetra_InteractionElement.cpp | 30 +
...4NodeTetra_Lin4NodeTetra_InteractionElement.hpp | 44 +
pkg/dem/deformablecohesive/LinElastMat.cpp | 14 +
pkg/dem/deformablecohesive/LinElastMat.hpp | 47 +
pkg/dem/deformablecohesive/Node.cpp | 3 +
pkg/dem/deformablecohesive/Node.hpp | 34 +
pkg/lbm/HydrodynamicsLawLBM.cpp | 2 +-
pkg/pfv/FlowEngine.hpp.in | 3 +-
pkg/pfv/FlowEngine.ipp.in | 3 +-
py/FEMxDEM/simDEM.py | 4 +-
py/__init__.py.in | 9 +-
py/_polyhedra_utils.cpp | 2 +-
py/_utils.cpp | 53 +-
py/_utils.hpp | 41 +-
py/bodiesHandling.py | 2 +
py/deformableelementsutils.py | 386 ++++
py/export.py | 54 +-
py/gridpfacet.py | 473 +++++
py/pack/_packPredicates.cpp | 2 +-
py/pack/_packSpheres.cpp | 2 +-
py/pack/pack.py | 4 +-
py/plot.py | 20 +-
py/tests/__init__.py | 6 +-
py/tests/cohesive-chain.py | 4 +-
py/tests/core.py | 48 +
py/utils.py | 91 +-
py/wrapper/yadeWrapper.cpp | 97 +-
py/ymport.py | 81 +-
.../checks/checkCapillaryModels.py | 90 +
.../checks/checkLiquidMigration.py | 2 +-
.../checks-and-tests/checks/checkPolyhedraCrush.py | 74 +
.../checks-and-tests/checks/checkSaveLoadClumps.py | 59 +
scripts/ppa/.mini-dinstall.conf | 13 +-
scripts/ppa/buildppa.py | 33 +-
287 files changed, 19597 insertions(+), 3045 deletions(-)
diff --cc debian/changelog
index 3994dd4,03e3099..83a3d1f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,87 +1,95 @@@
+ yade (2016.06a-4) unstable; urgency=medium
+
+ * [c982cf0] Add python-pyqt5.qtwebkit to dependencies.
+ * [9525172] Fix crash during testing.
+
+ -- Anton Gladky <gladk at debian.org> Wed, 24 Aug 2016 20:14:20 +0200
+
+ yade (2016.06a-3) unstable; urgency=medium
+
+ * [a216214] Disable check-script temporarily.
+
+ -- Anton Gladky <gladk at debian.org> Tue, 26 Jul 2016 19:42:51 +0200
+
+ yade (2016.06a-2) unstable; urgency=medium
+
+ * [0713e25] Add texlive-generic-extra to build-depends. (Closes: #829352)
+
+ -- Anton Gladky <gladk at debian.org> Mon, 25 Jul 2016 21:17:53 +0200
+
+ yade (2016.06a-1) unstable; urgency=medium
+
+ * [a70d0b6] Refresh, update patches.
+ * [6bff5bc] Imported Upstream version 2016.06a
+ * [4916356] Apply cme fix dpkg.
+
+ -- Anton Gladky <gladk at debian.org> Sun, 19 Jun 2016 17:23:23 +0200
+
+ yade (1.20.0-10) unstable; urgency=medium
+
+ [ Anton Gladky ]
+ * [bc45d12] Remove some machine-specific items in documentation.
+
+ [ Graham Inggs ]
+ * [57d5a6d] Fix glibc_2.23 compilation. (Closes: #820450)
+
+ -- Anton Gladky <gladk at debian.org> Thu, 02 Jun 2016 22:56:10 +0200
+
+ yade (1.20.0-9) unstable; urgency=medium
+
+ [ Anton Gladky ]
+ * [2a9a603] Update dependencies for libqglviewer-dev-qt5.
+
+ [ Graham Inggs ]
+ * [a68444e] Fix FTBFS with glibc 2.23. (Closes: #820450)
+
+ -- Anton Gladky <gladk at debian.org> Fri, 20 May 2016 19:49:42 +0200
+
+ yade (1.20.0-8) unstable; urgency=medium
+
+ * [1960e9d] Add allow-stderr to autopkgtests.
+
+ -- Anton Gladky <gladk at debian.org> Fri, 18 Mar 2016 06:31:45 +0100
+
+ yade (1.20.0-7) unstable; urgency=high
+
+ * [5fb4ec8] Fix warning in newer matplotlib.
+
+ -- Anton Gladky <gladk at debian.org> Sun, 14 Feb 2016 11:38:28 +0100
+
+ yade (1.20.0-6) unstable; urgency=medium
+
+ * [87574cb] Disable parallel builds. (Closes: #805032)
+
+ -- Anton Gladky <gladk at debian.org> Fri, 13 Nov 2015 21:06:18 +0100
+
+ yade (1.20.0-5) unstable; urgency=medium
+
+ * [0a7070e] Do not use parallel build on arm64
+
+ -- Anton Gladky <gladk at debian.org> Mon, 26 Oct 2015 17:58:12 +0100
+
+ yade (1.20.0-4) unstable; urgency=medium
+
+ * [e6cacc9] Remove amd64 from unsupported archs.
+
+ -- Anton Gladky <gladk at debian.org> Sun, 25 Oct 2015 14:23:43 +0100
+
+ yade (1.20.0-3) unstable; urgency=medium
+
+ * [eba76bf] Remove menu-file.
+ * [c490032] Drop unused architectures. (Closes: #793833)
+
+ -- Anton Gladky <gladk at debian.org> Sun, 25 Oct 2015 14:18:38 +0100
+
+yade (1.20.0-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * [057cfec] Update changelog.
+ * [53792e6] Disable QT5-mode.
+
+ -- Anton Gladky <gladk at debian.org> Fri, 23 Oct 2015 12:05:37 +0200
+
yade (1.20.0-2) unstable; urgency=medium
* [de077fc] Replace INSTALL_PREFIX by CMAKE_INSTALL_PREFIX.
diff --cc debian/control
index 64d2aef,6736cf5..f67c81e
--- a/debian/control
+++ b/debian/control
@@@ -16,22 -16,22 +16,22 @@@ Build-Depends: cmake
libgl1-mesa-dev,
libgts-dev,
libloki-dev,
- libmetis-dev [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc],
- libopenblas-dev [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc],
- libqglviewer-dev [!armel !armhf],
- libsuitesparse-dev [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc],
- libvtk6-dev[!armel !armhf],
+ libmetis-dev [amd64 i386 powerpc],
+ libopenblas-dev [amd64 i386 powerpc],
+ libqglviewer-dev-qt5,
+ libsuitesparse-dev [amd64 i386 powerpc],
+ libvtk6-dev,
libxi-dev,
libxmu-dev,
- pyqt5-dev-tools,
+ pyqt4-dev-tools,
python-all-dev,
python-gts,
python-imaging,
python-matplotlib,
- python-minieigen [!s390],
+ python-minieigen,
python-numpy,
python-sip,
- python-pyqt5,
+ python-qt4,
python-tk,
python-xlib,
zlib1g-dev
--
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