[yade] 01/04: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Fri Jul 11 21:28:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch wheezy
in repository yade.
commit 6205258175d9ddd43a6b99229ea0f2baa09d6858
Merge: b4ab260 67a7bc3
Author: Anton Gladky <gladk at debian.org>
Date: Sat Jul 5 22:32:00 2014 +0200
Merge.
.gitignore | 1 -
CMakeLists.txt | 112 +-
ChangeLog | 338 +++++
INSTALL | 8 +
RELEASE | 2 +-
cMake/FindMetis.cmake | 2 +-
cMake/FindOpenBlas.cmake | 6 +-
core/Body.cpp | 24 +-
core/Body.hpp | 37 +-
core/BodyContainer.cpp | 26 +-
core/BodyContainer.hpp | 3 +-
core/Bound.hpp | 2 +-
core/Cell.hpp | 2 +-
core/Clump.cpp | 41 +-
core/Clump.hpp | 4 +-
core/Dispatcher.hpp | 32 +-
core/EnergyTracker.hpp | 2 +-
core/FileGenerator.hpp | 2 +-
core/ForceContainer.hpp | 57 +-
core/Functor.hpp | 4 +-
core/InteractionContainer.cpp | 50 +-
core/InteractionContainer.hpp | 73 +-
core/Omega.cpp | 20 +-
core/Omega.hpp | 1 -
core/Scene.cpp | 15 +-
core/Scene.hpp | 17 +-
core/State.cpp | 28 +-
core/State.hpp | 6 +-
core/main/main.py.in | 15 +-
core/main/pyboot.cpp | 10 +-
core/main/yade-batch.in | 7 +-
debian/changelog | 10 +
debian/control | 3 +-
debian/patches/01_fix_ipython_1.0.patch | 16 -
...tics.patch => 01_remove_google_analytics.patch} | 6 +-
debian/patches/03_increase_steps_in_test.patch | 15 -
debian/patches/04_fix_libqglviewer.patch | 37 -
debian/patches/series | 5 +-
doc/references.bib | 69 +
doc/sphinx/citing.rst | 2 +-
doc/sphinx/conf.py | 8 +-
doc/sphinx/installation.rst | 71 +-
doc/sphinx/ipython_directive200.py | 1154 +++++++++++++++++
doc/sphinx/prog.rst | 4 +-
doc/sphinx/publications.rst.in | 2 +-
doc/sphinx/references.bib | 10 +
doc/sphinx/templates/index.html | 5 +-
doc/sphinx/user.rst | 10 +-
doc/yade-articles.bib | 15 +-
doc/yade-conferences.bib | 28 +-
examples/FluidCouplingLBM/Buoyancy_Gradient.m | 138 ++
examples/FluidCouplingLBM/buoyancy.py | 195 +++
examples/FluidCouplingLBM/yadeLBMvisu.m | 151 +++
examples/FluidCouplingPFV/oedometer.py | 2 +-
examples/PIDController.py | 5 +-
examples/ResetRandomPosition.py | 6 +-
examples/ViscElMatchMaker.py | 64 +
.../simple-scene-plot-NewtonIntegrator.py | 49 +
.../simple-scene-plot-RungeKuttaCashKarp54.py | 65 +
examples/baraban/BicyclePedalEngine.py | 5 +-
examples/baraban/baraban.py | 5 +-
examples/billiard.py | 58 +
examples/bulldozer/bulldozerVTK.py | 5 +-
examples/capillary/capillar.py | 97 ++
examples/capillary/liquidmigration/showcase.py | 130 ++
examples/clumps/clump-hopper-viscoelastic.py | 5 +-
examples/clumps/clump-inbox-viscoelastic.py | 5 +-
examples/clumps/clump-viscoelastic.py | 5 +-
examples/concrete/uniax.py | 4 +-
examples/conveyor/conveyor.geo | 24 +
examples/conveyor/conveyor.mesh | 1360 +++++++++++++++++++
examples/conveyor/conveyor.py | 55 +
examples/gts-horse/gts-random-pack-obb.py | 2 +-
examples/jointedCohesiveFrictionalPM/gravityBis.py | 14 +-
examples/jointedCohesiveFrictionalPM/identifBis.py | 54 +-
examples/packs/packs.py | 2 +-
examples/ring2d/ringSimpleViscoelastic.py | 5 +-
examples/rotationalResistance.py | 6 +-
examples/sph/README | 5 +
examples/sph/box.geo | 27 +
examples/sph/box.mesh | 1273 ++++++++++++++++++
examples/sph/cpt/a | 0
examples/sph/sph_box.py | 52 +
examples/sph/testKernelFunc.py | 91 ++
examples/sph/toystar.py | 51 +
examples/sph/watercolumn.py | 63 +
examples/tesselationwrapper/tesselationWrapper.py | 2 +-
examples/test/batch/sim.py | 2 +-
examples/test/facet-sphere-ViscElBasic-peri.py | 7 +-
examples/test/facet-sphere-ViscElBasic.py | 5 +-
.../paraview-spheres-solid-section/export_text.py | 12 +
.../paraview-spheres-solid-section/pv_section.py | 660 ++++++++++
examples/test/performance/checkPerf.py | 82 +-
examples/test/periodic-geom-compare.py | 1 -
examples/test/periodic-simple-shear.py | 41 +-
examples/test/periodic-triax-settingHsize.py | 3 +-
examples/test/periodic-triax.py | 1 -
examples/test/sphere-sphere-ViscElBasic-peri.py | 3 +-
examples/test/unv-read/unvRead.py | 1 -
examples/test/vtk-exporter/vtkExporter.py | 34 +-
examples/timeStepperUsage.py | 2 +-
gui/qt4/GLViewer.cpp | 114 +-
gui/qt4/GLViewer.hpp | 4 +-
gui/qt4/GLViewerDisplay.cpp | 24 +-
gui/qt4/GLViewerMouse.cpp | 14 +-
gui/qt4/SerializableEditor.py | 2 +-
gui/qt4/XYZ.xpm | 45 +
gui/qt4/YZX.xpm | 45 +
gui/qt4/ZXY.xpm | 45 +
gui/qt4/_GLViewer.cpp | 6 +-
gui/qt4/controller.ui | 8 +-
gui/qt4/img.qrc | 8 +-
gui/qt4/yade-favicon.xpm | 229 ++++
lib/base/Logging.hpp | 15 +-
lib/base/Math.cpp | 15 +
lib/base/Math.hpp | 46 +-
lib/base/openmp-accu.hpp | 75 +-
lib/factory/DynLibManager.cpp | 1 -
lib/multimethods/DynLibDispatcher.hpp | 6 +-
lib/serialization/ObjectIO.hpp | 12 +-
lib/serialization/Serializable.cpp | 35 +-
lib/serialization/Serializable.hpp | 33 +-
lib/smoothing/WeightedAverage2d.hpp | 50 +-
lib/triangulation/FlowBoundingSphere.cpp | 28 -
lib/triangulation/FlowBoundingSphere.hpp | 123 +-
lib/triangulation/FlowBoundingSphere.ipp | 1195 +++++++----------
lib/triangulation/FlowBoundingSphereLinSolv.hpp | 62 +-
lib/triangulation/FlowBoundingSphereLinSolv.ipp | 244 ++--
.../KinematicLocalisationAnalyser.cpp | 50 +-
.../KinematicLocalisationAnalyser.hpp | 22 +-
lib/triangulation/Network.hpp | 72 +-
lib/triangulation/Network.ipp | 284 ++--
lib/triangulation/PeriodicFlow.cpp | 650 ----------
lib/triangulation/PeriodicFlow.hpp | 458 ++++++-
lib/triangulation/PeriodicFlowLinSolv.hpp | 27 +-
lib/triangulation/PeriodicFlowLinSolv.ipp | 149 +--
lib/triangulation/RegularTriangulation.h | 108 +-
lib/triangulation/Tenseur3.cpp | 14 +-
lib/triangulation/Tenseur3.h | 10 +-
lib/triangulation/Tesselation.h | 152 ++-
lib/triangulation/Tesselation.ipp | 377 +-----
lib/triangulation/TriaxialState.cpp | 6 +-
lib/triangulation/TriaxialState.h | 14 +-
lib/triangulation/def_types.h | 225 ----
pkg/common/Collider.cpp | 16 +-
pkg/common/Collider.hpp | 4 +-
pkg/common/CylScGeom6D.hpp | 2 +
pkg/common/Cylinder.cpp | 11 +-
pkg/common/Cylinder.hpp | 5 +-
pkg/common/Dispatching.cpp | 24 +-
pkg/common/Dispatching.hpp | 1 +
pkg/common/Facet.cpp | 2 +-
pkg/common/Gl1_NormPhys.cpp | 2 +-
pkg/common/Gl1_NormPhys.hpp | 13 +-
pkg/common/GravityEngines.cpp | 8 +-
pkg/common/Grid.cpp | 21 +-
pkg/common/Grid.hpp | 2 +-
pkg/common/InsertionSortCollider.cpp | 262 ++--
pkg/common/InsertionSortCollider.hpp | 24 +-
pkg/common/InteractionLoop.cpp | 44 +-
pkg/common/InteractionLoop.hpp | 2 +-
pkg/common/KinematicEngines.cpp | 1 +
pkg/common/KinematicEngines.hpp | 1 +
pkg/common/MatchMaker.cpp | 2 +-
pkg/common/OpenGLRenderer.cpp | 12 +-
pkg/common/OpenGLRenderer.hpp | 5 +
pkg/common/ParallelEngine.cpp | 22 +-
pkg/common/ParallelEngine.hpp | 4 +-
pkg/common/PersistentTriangulationCollider.cpp | 2 +-
pkg/common/Recorder.cpp | 2 +-
pkg/common/SPHEngine.cpp | 403 ++++++
pkg/common/SPHEngine.hpp | 46 +
pkg/common/SpatialQuickSortCollider.cpp | 2 +-
pkg/common/Wall.cpp | 1 +
pkg/common/ZECollider.cpp | 2 +-
pkg/dem/CapillaryStressRecorder.cpp | 20 +-
pkg/dem/CapillaryTriaxialTest.cpp | 40 +-
pkg/dem/CohFrictMat.hpp | 11 +-
pkg/dem/CohFrictPhys.hpp | 14 +-
pkg/dem/CohesiveFrictionalContactLaw.cpp | 72 +-
pkg/dem/CohesiveFrictionalContactLaw.hpp | 16 +-
pkg/dem/CohesiveTriaxialTest.cpp | 21 +-
pkg/dem/ConcretePM.cpp | 6 +-
pkg/dem/ConcretePM.hpp | 36 +-
pkg/dem/Disp2DPropLoadEngine.cpp | 12 +-
pkg/dem/DomainLimiter.cpp | 8 +-
pkg/dem/FacetTopologyAnalyzer.cpp | 2 +-
pkg/dem/FlatGridCollider.cpp | 4 +-
pkg/dem/FlowEngine.cpp | 1137 ----------------
pkg/dem/FlowEngine.hpp | 488 -------
pkg/dem/FrictViscoPM.cpp | 228 ++++
pkg/dem/FrictViscoPM.hpp | 121 ++
pkg/dem/GeneralIntegratorInsertionSortCollider.cpp | 228 ++++
pkg/dem/GeneralIntegratorInsertionSortCollider.hpp | 39 +
pkg/dem/GlobalStiffnessTimeStepper.cpp | 2 +-
pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp | 2 +-
pkg/dem/Integrator.cpp | 351 +++++
pkg/dem/Integrator.hpp | 113 ++
.../Ip2_CohFrictMat_CohFrictMat_CohFrictPhys.cpp | 9 +-
.../Ip2_CohFrictMat_CohFrictMat_CohFrictPhys.hpp | 2 +-
pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.cpp | 18 +-
pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp | 2 +-
pkg/dem/JointedCohesiveFrictionalPM.cpp | 49 +-
pkg/dem/JointedCohesiveFrictionalPM.hpp | 8 +-
pkg/dem/KinemCNDEngine.cpp | 2 +-
pkg/dem/KinemCNLEngine.cpp | 6 +-
pkg/dem/KinemCNSEngine.cpp | 2 +-
pkg/dem/KinemCTDEngine.cpp | 16 +-
pkg/dem/KinemSimpleShearBox.cpp | 25 +-
pkg/dem/L3Geom.hpp | 2 +-
...ScGeom6D_InelastCohFrictPhys_CohesionMoment.hpp | 3 +-
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp | 4 +-
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp | 4 +-
pkg/dem/MicroMacroAnalyser.cpp | 16 +-
pkg/dem/MicroMacroAnalyser.hpp | 4 +-
pkg/dem/NewtonIntegrator.cpp | 38 +-
pkg/dem/NewtonIntegrator.hpp | 1 +
pkg/dem/NormalInelasticityLaw.cpp | 2 +-
pkg/dem/NormalInelasticityLaw.hpp | 2 +-
pkg/dem/PeriIsoCompressor.cpp | 2 +-
pkg/dem/PeriIsoCompressor.hpp | 5 +-
pkg/dem/Polyhedra.cpp | 85 +-
pkg/dem/Polyhedra.hpp | 66 +-
pkg/dem/Polyhedra_Ig2.cpp | 17 +
pkg/dem/Polyhedra_splitter.cpp | 40 +-
pkg/dem/Polyhedra_support.cpp | 80 +-
pkg/dem/RungeKuttaCashKarp54Integrator.cpp | 34 +
pkg/dem/RungeKuttaCashKarp54Integrator.hpp | 49 +
pkg/dem/SampleCapillaryPressureEngine.cpp | 5 +-
pkg/dem/ScGeom.hpp | 4 +-
pkg/dem/Shop.hpp | 4 +-
pkg/dem/Shop_01.cpp | 32 +-
pkg/dem/Shop_02.cpp | 31 +-
pkg/dem/SimpleShear.cpp | 24 +-
pkg/dem/SpherePack.cpp | 18 +-
pkg/dem/SpherePack.hpp | 35 +-
pkg/dem/SpheresFactory.cpp | 4 +-
pkg/dem/TesselationWrapper.cpp | 38 +-
pkg/dem/TesselationWrapper.hpp | 60 +-
pkg/dem/Tetra.cpp | 8 +-
pkg/dem/TriaxialCompressionEngine.cpp | 8 +-
pkg/dem/TriaxialStateRecorder.cpp | 20 +-
pkg/dem/TriaxialStressController.hpp | 8 +-
pkg/dem/TriaxialTest.cpp | 9 +-
pkg/dem/UniaxialStrainer.cpp | 10 +-
pkg/dem/UniaxialStrainer.hpp | 5 +-
pkg/dem/VTKRecorder.cpp | 132 +-
pkg/dem/VTKRecorder.hpp | 6 +-
pkg/dem/ViscoelasticCapillarPM.cpp | 714 ++++++++--
pkg/dem/ViscoelasticCapillarPM.hpp | 114 ++
pkg/dem/ViscoelasticPM.cpp | 388 +++---
pkg/dem/ViscoelasticPM.hpp | 65 +-
pkg/lbm/HydrodynamicsLawLBM.cpp | 1370 ++++++++++++++++++++
pkg/lbm/HydrodynamicsLawLBM.hpp | 302 +++++
pkg/lbm/LBMbody.cpp | 16 +
pkg/lbm/LBMbody.hpp | 46 +
pkg/lbm/LBMlink.cpp | 17 +
pkg/lbm/LBMlink.hpp | 37 +
pkg/lbm/LBMnode.cpp | 120 ++
pkg/lbm/LBMnode.hpp | 67 +
pkg/pfv/DFNFlow.cpp | 107 ++
pkg/pfv/DummyFlowEngine.cpp | 59 +
pkg/pfv/FlowEngine.cpp | 39 +
pkg/pfv/FlowEngine.hpp | 16 +
pkg/pfv/FlowEngine.hpp.in | 416 ++++++
pkg/pfv/FlowEngine.ipp | 1 +
pkg/pfv/FlowEngine.ipp.in | 737 +++++++++++
pkg/pfv/PeriodicFlowEngine.cpp | 531 ++++++++
pkg/pfv/SoluteFlowEngine.cpp | 196 +++
py/WeightedAverage2d.cpp | 2 +-
py/_polyhedra_utils.cpp | 194 ++-
py/_utils.cpp | 63 +-
py/bodiesHandling.py | 2 +-
py/config.py.in | 7 +-
py/export.py | 525 ++++++--
py/geom.py | 75 +-
py/pack/_packObb.cpp | 14 +-
py/pack/_packSpheres.cpp | 27 +-
py/polyhedra_utils.py | 57 +
py/runtime.py | 2 +-
py/tests/cohesive-chain.py | 1 -
py/utils.py | 2 +-
py/wrapper/customConverters.cpp | 151 +--
py/wrapper/yadeWrapper.cpp | 285 ++--
py/ymport.py | 31 +-
scripts/checks-and-tests/checks/DEM-PFV-check.py | 16 +-
scripts/checks-and-tests/checks/checkGravity.py | 5 +-
.../checks/checkLiquidMigration.py | 104 ++
scripts/checks-and-tests/checks/checkViscElEng.py | 4 +-
scripts/checks-and-tests/checks/checkWeight.py | 5 +-
scripts/ppa/.mini-dinstall.conf | 1 +
scripts/ppa/buildppa.py | 11 +-
scripts/update_names.sh | 67 +
293 files changed, 17986 insertions(+), 6449 deletions(-)
diff --cc debian/changelog
index 87d6754,398d0f5..24e2d41
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+ yade (1.10.0-1) unstable; urgency=medium
+
+ * [431abb8] Imported Upstream version 1.10.0 (Closes: #750318)
+ * [3552a3e] Set minimal vtk6 version 6.1.0+dfsg-8.
+ * [cd915f6] Set minimal eigen3 version 3.2.1-2.
+ * [8e02049] Add autopkgtest-field to control.
+ * [38389f8] Remove patches aplied by upstream.
+
+ -- Anton Gladky <gladk at debian.org> Wed, 25 Jun 2014 20:43:49 +0200
+
+yade (1.07.0-4~bpo70+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+
+ -- Anton Gladky <gladk at debian.org> Thu, 10 Apr 2014 19:53:56 +0200
+
yade (1.07.0-4) unstable; urgency=medium
* [053bf6f] Remove some build-depends, which were added to VTK6.
--
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