[yade] 01/02: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Mon Jun 15 04:43:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch wheezy
in repository yade.
commit df2cda54d3c85a9b2f86d4acc795f50329fcabc1
Merge: 1fee2df 5ac2a25
Author: Anton Gladky <gladk at debian.org>
Date: Wed Nov 5 20:59:07 2014 +0100
Merge.
CMakeLists.txt | 23 +-
ChangeLog | 228 +++-
RELEASE | 2 +-
core/Body.cpp | 8 +-
core/Body.hpp | 6 +-
core/BodyContainer.cpp | 6 +-
core/BodyContainer.hpp | 2 +-
core/Bound.hpp | 8 +-
core/Cell.cpp | 2 +-
core/Cell.hpp | 6 +-
core/Clump.cpp | 8 +-
core/Clump.hpp | 8 +-
core/Dispatcher.hpp | 8 +-
core/EnergyTracker.hpp | 4 +-
core/Engine.hpp | 8 +-
core/FileGenerator.cpp | 6 +-
core/FileGenerator.hpp | 4 +-
core/ForceContainer.hpp | 4 +-
core/FrontEnd.hpp | 2 +-
core/Functor.hpp | 6 +-
core/GLConfig.hpp | 2 +-
core/IGeom.hpp | 8 +-
core/IPhys.hpp | 8 +-
core/Interaction.cpp | 2 +-
core/Interaction.hpp | 8 +-
core/InteractionContainer.cpp | 4 +-
core/InteractionContainer.hpp | 41 +-
core/Material.cpp | 4 +-
core/Material.hpp | 8 +-
core/Omega.cpp | 8 +-
core/Omega.hpp | 6 +-
core/PartialEngine.hpp | 4 +-
core/Scene.cpp | 12 +-
core/Scene.hpp | 18 +-
core/Shape.hpp | 6 +-
core/SimulationFlow.cpp | 2 +-
core/State.cpp | 2 +-
core/State.hpp | 6 +-
core/ThreadRunner.cpp | 2 +-
core/corePlugins.cpp | 40 +-
core/main/pyboot.cpp | 4 +-
debian/changelog | 15 +
debian/control | 8 +-
debian/copyright | 20 +-
debian/patches/03_fix_i386_segfault.patch | 32 -
debian/patches/series | 1 -
debian/rules | 2 +-
debian/source/local-options | 1 -
debian/{upstream => upstream/metadata} | 0
doc/references.bib | 61 +-
doc/sphinx/github.rst | 2 +
doc/sphinx/introduction.rst | 2 +-
doc/sphinx/prog.rst | 26 +-
doc/sphinx/references.bib | 330 ------
doc/sphinx/tutorial/06-periodic-triaxial-test.py | 4 -
doc/sphinx/yadeSphinx.py | 10 +-
doc/yade-articles.bib | 14 +
examples/polyhedra/ball.py | 2 +-
examples/polyhedra/free-fall.py | 2 +-
examples/polyhedra/irregular.py | 2 +-
examples/polyhedra/wall.py | 2 +-
examples/sph/dam_break.py | 89 ++
examples/sph/sph_box.py | 27 +-
examples/sph/toystar.py | 11 +-
examples/sph/watercolumn.py | 24 +-
examples/tetra/twoTetrasPoly.py | 2 +-
examples/triax-tutorial/script-session1.py | 2 +-
gui/qt4/GLViewer.cpp | 14 +-
gui/qt4/GLViewer.hpp | 6 +-
gui/qt4/GLViewerDisplay.cpp | 14 +-
gui/qt4/GLViewerMouse.cpp | 14 +-
gui/qt4/SerializableEditor.py | 119 ++-
gui/qt4/_GLViewer.cpp | 4 +-
lib/base/Math.cpp | 2 +-
lib/base/openmp-accu.hpp | 2 +-
lib/factory/ClassFactory.cpp | 2 +-
lib/factory/ClassFactory.hpp | 4 +-
lib/factory/DynLibManager.hpp | 4 +-
lib/multimethods/DynLibDispatcher.hpp | 4 +-
lib/multimethods/FunctorWrapper.hpp | 2 +-
lib/opengl/GLUtils.hpp | 2 +-
lib/opengl/OpenGLWrapper.hpp | 2 +-
lib/pyutil/gil.cpp | 2 +-
lib/serialization/Serializable.hpp | 8 +-
lib/smoothing/WeightedAverage2d.hpp | 2 +-
lib/triangulation/FlowBoundingSphere.hpp | 11 +-
lib/triangulation/FlowBoundingSphere.ipp | 46 +-
lib/triangulation/FlowBoundingSphereLinSolv.hpp | 2 +-
lib/triangulation/FlowBoundingSphereLinSolv.ipp | 17 +-
lib/triangulation/Network.hpp | 3 +
lib/triangulation/Network.ipp | 79 ++
lib/triangulation/PeriodicFlow.hpp | 26 +-
lib/triangulation/RegularTriangulation.h | 2 +-
pkg/common/Aabb.hpp | 2 +-
pkg/common/Bo1_Aabb.cpp | 2 +-
pkg/common/Bo1_Aabb.hpp | 10 +-
pkg/common/BoundaryController.hpp | 2 +-
pkg/common/Box.hpp | 2 +-
pkg/common/Callbacks.hpp | 2 +-
pkg/common/Collider.cpp | 2 +-
pkg/common/Collider.hpp | 8 +-
pkg/common/CylScGeom6D.hpp | 2 +-
pkg/common/Cylinder.cpp | 6 +-
pkg/common/Cylinder.hpp | 16 +-
pkg/common/Dispatching.cpp | 4 +-
pkg/common/Dispatching.hpp | 22 +-
pkg/common/ElastMat.hpp | 2 +-
pkg/common/Facet.hpp | 4 +-
pkg/common/FieldApplier.hpp | 2 +-
pkg/common/ForceEngine.cpp | 12 +-
pkg/common/ForceEngine.hpp | 2 +-
pkg/common/ForceResetter.hpp | 4 +-
pkg/common/GLDrawFunctors.hpp | 20 +-
pkg/common/Gl1_NormPhys.cpp | 12 +-
pkg/common/Gl1_NormPhys.hpp | 8 +-
pkg/common/Gl1_Primitives.cpp | 4 +-
pkg/common/Gl1_Primitives.hpp | 10 +-
pkg/common/GravityEngines.cpp | 10 +-
pkg/common/GravityEngines.hpp | 6 +-
pkg/common/Grid.cpp | 46 +-
pkg/common/Grid.hpp | 16 +-
pkg/common/Grid_GUI.cpp | 2 +-
pkg/common/InsertionSortCollider.cpp | 53 +-
pkg/common/InsertionSortCollider.hpp | 4 +-
pkg/common/InteractionLoop.hpp | 6 +-
pkg/common/KinematicEngines.cpp | 8 +-
pkg/common/KinematicEngines.hpp | 4 +-
pkg/common/MatchMaker.cpp | 2 +-
pkg/common/MatchMaker.hpp | 2 +-
pkg/common/NormShearPhys.hpp | 2 +-
pkg/common/OpenGLRenderer.cpp | 12 +-
pkg/common/OpenGLRenderer.hpp | 10 +-
pkg/common/ParallelEngine.cpp | 2 +-
pkg/common/ParallelEngine.hpp | 2 +-
pkg/common/PeriodicEngines.hpp | 17 +-
pkg/common/PersistentTriangulationCollider.cpp | 10 +-
pkg/common/PersistentTriangulationCollider.hpp | 6 +-
pkg/common/PyRunner.hpp | 8 +-
pkg/common/Recorder.hpp | 2 +-
pkg/common/ResetRandomPosition.cpp | 12 +-
pkg/common/ResetRandomPosition.hpp | 8 +-
pkg/common/SPHEngine.cpp | 333 +-----
pkg/common/SPHEngine.hpp | 23 +-
pkg/common/SpatialQuickSortCollider.cpp | 4 +-
pkg/common/SpatialQuickSortCollider.hpp | 4 +-
pkg/common/Sphere.hpp | 2 +-
pkg/common/StepDisplacer.hpp | 6 +-
pkg/common/TorqueEngine.hpp | 4 +-
pkg/common/Wall.cpp | 6 +-
pkg/common/Wall.hpp | 6 +-
pkg/common/ZECollider.cpp | 12 +-
pkg/common/ZECollider.hpp | 4 +-
pkg/common/common.cpp | 32 +-
pkg/dem/BubbleMat.hpp | 8 +-
pkg/dem/CapillaryPhys.cpp | 4 +-
pkg/dem/CapillaryPhys.hpp | 16 +-
pkg/dem/CapillaryStressRecorder.cpp | 14 +-
pkg/dem/CapillaryStressRecorder.hpp | 2 +-
pkg/dem/CapillaryTriaxialTest.cpp | 60 +-
pkg/dem/CapillaryTriaxialTest.hpp | 4 +-
pkg/dem/CohesiveFrictionalContactLaw.cpp | 6 +-
pkg/dem/CohesiveFrictionalContactLaw.hpp | 14 +-
pkg/dem/CohesiveTriaxialTest.cpp | 40 +-
pkg/dem/CohesiveTriaxialTest.hpp | 4 +-
pkg/dem/ConcretePM.cpp | 16 +-
pkg/dem/ConcretePM.hpp | 18 +-
pkg/dem/DemXDofGeom.hpp | 2 +-
pkg/dem/Disp2DPropLoadEngine.cpp | 8 +-
pkg/dem/Disp2DPropLoadEngine.hpp | 6 +-
pkg/dem/DomainLimiter.cpp | 26 +-
pkg/dem/DomainLimiter.hpp | 8 +-
pkg/dem/ElasticContactLaw.cpp | 10 +-
pkg/dem/ElasticContactLaw.hpp | 10 +-
pkg/dem/FacetTopologyAnalyzer.cpp | 6 +-
pkg/dem/FacetTopologyAnalyzer.hpp | 4 +-
pkg/dem/FlatGridCollider.cpp | 10 +-
pkg/dem/FlatGridCollider.hpp | 2 +-
pkg/dem/ForceTorqueRecorder.hpp | 4 +-
pkg/dem/FrictPhys.cpp | 2 +-
pkg/dem/FrictPhys.hpp | 8 +-
pkg/dem/FrictViscoPM.cpp | 6 +-
pkg/dem/FrictViscoPM.hpp | 12 +-
pkg/dem/GeneralIntegratorInsertionSortCollider.cpp | 12 +-
pkg/dem/GeneralIntegratorInsertionSortCollider.hpp | 2 +-
pkg/dem/GlobalStiffnessTimeStepper.cpp | 22 +-
pkg/dem/GlobalStiffnessTimeStepper.hpp | 2 +-
pkg/dem/HertzMindlin.cpp | 6 +-
pkg/dem/HertzMindlin.hpp | 20 +-
pkg/dem/Ig2_Box_Sphere_ScGeom.cpp | 10 +-
pkg/dem/Ig2_Box_Sphere_ScGeom.hpp | 6 +-
pkg/dem/Ig2_Facet_Sphere_ScGeom.cpp | 14 +-
pkg/dem/Ig2_Facet_Sphere_ScGeom.hpp | 10 +-
pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp | 12 +-
pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp | 4 +-
pkg/dem/InelastCohFrictPM.hpp | 6 +-
pkg/dem/Integrator.cpp | 6 +-
pkg/dem/Integrator.hpp | 2 +-
pkg/dem/Ip2_ElastMat.cpp | 4 +-
pkg/dem/Ip2_ElastMat.hpp | 6 +-
pkg/dem/JointedCohesiveFrictionalPM.cpp | 76 +-
pkg/dem/JointedCohesiveFrictionalPM.hpp | 11 +-
pkg/dem/KinemC__Engine.cpp | 2 +-
pkg/dem/KinemC__Engine.hpp | 2 +-
pkg/dem/KinemSimpleShearBox.cpp | 8 +-
pkg/dem/KinemSimpleShearBox.hpp | 8 +-
pkg/dem/L3Geom.cpp | 12 +-
pkg/dem/L3Geom.hpp | 22 +-
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp | 81 +-
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp | 16 +-
pkg/dem/LudingPM.cpp | 10 +-
pkg/dem/LudingPM.hpp | 8 +-
pkg/dem/MicroMacroAnalyser.cpp | 20 +-
pkg/dem/MicroMacroAnalyser.hpp | 4 +-
pkg/dem/NewtonIntegrator.cpp | 27 +-
pkg/dem/NewtonIntegrator.hpp | 10 +-
pkg/dem/NormalInelasticPM.cpp | 6 +-
pkg/dem/NormalInelasticPM.hpp | 8 +-
pkg/dem/PeriIsoCompressor.cpp | 12 +-
pkg/dem/PeriIsoCompressor.hpp | 2 +-
pkg/dem/Polyhedra.cpp | 57 +-
pkg/dem/Polyhedra.hpp | 65 +-
pkg/dem/Polyhedra_Ig2.cpp | 38 +-
pkg/dem/Polyhedra_Ig2.hpp | 3 +-
pkg/dem/Polyhedra_splitter.cpp | 2 +-
pkg/dem/Polyhedra_splitter.hpp | 4 +-
pkg/dem/Polyhedra_support.cpp | 80 +-
pkg/dem/RungeKuttaCashKarp54Integrator.cpp | 4 +-
pkg/dem/RungeKuttaCashKarp54Integrator.hpp | 4 +-
pkg/dem/STLImporter.cpp | 4 +-
pkg/dem/STLImporter.hpp | 6 +-
pkg/dem/SampleCapillaryPressureEngine.cpp | 10 +-
pkg/dem/SampleCapillaryPressureEngine.hpp | 6 +-
pkg/dem/ScGeom.cpp | 6 +-
pkg/dem/ScGeom.hpp | 10 +-
pkg/dem/Shop.hpp | 12 +-
pkg/dem/Shop_01.cpp | 65 +-
pkg/dem/Shop_02.cpp | 82 +-
pkg/dem/SimpleShear.cpp | 48 +-
pkg/dem/SimpleShear.hpp | 2 +-
pkg/dem/SnapshotEngine.hpp | 8 +-
pkg/dem/SpherePack.cpp | 164 +--
pkg/dem/SpherePack.hpp | 4 +-
pkg/dem/SpheresFactory.cpp | 4 +-
pkg/dem/SpheresFactory.hpp | 6 +-
pkg/dem/TesselationWrapper.cpp | 8 +-
pkg/dem/TesselationWrapper.hpp | 12 +-
pkg/dem/Tetra.cpp | 16 +-
pkg/dem/Tetra.hpp | 14 +-
pkg/dem/ThreeDTriaxialEngine.cpp | 16 +-
pkg/dem/ThreeDTriaxialEngine.hpp | 6 +-
pkg/dem/TriaxialCompressionEngine.cpp | 16 +-
pkg/dem/TriaxialCompressionEngine.hpp | 6 +-
pkg/dem/TriaxialStateRecorder.cpp | 16 +-
pkg/dem/TriaxialStateRecorder.hpp | 2 +-
pkg/dem/TriaxialStressController.cpp | 47 +-
pkg/dem/TriaxialStressController.hpp | 6 +-
pkg/dem/TriaxialTest.cpp | 60 +-
pkg/dem/TriaxialTest.hpp | 2 +-
pkg/dem/UnbalancedForceCallbacks.cpp | 10 +-
pkg/dem/UnbalancedForceCallbacks.hpp | 4 +-
pkg/dem/UniaxialStrainer.cpp | 6 +-
pkg/dem/UniaxialStrainer.hpp | 6 +-
pkg/dem/VTKRecorder.cpp | 32 +-
pkg/dem/VTKRecorder.hpp | 2 +-
pkg/dem/ViscoelasticCapillarPM.cpp | 25 +-
pkg/dem/ViscoelasticCapillarPM.hpp | 2 +-
pkg/dem/ViscoelasticPM.cpp | 15 +-
pkg/dem/ViscoelasticPM.hpp | 21 +-
pkg/dem/WirePM.cpp | 8 +-
pkg/dem/WirePM.hpp | 8 +-
pkg/lbm/HydrodynamicsLawLBM.cpp | 10 +-
pkg/lbm/HydrodynamicsLawLBM.hpp | 8 +-
pkg/lbm/LBMbody.hpp | 4 +-
pkg/lbm/LBMlink.hpp | 4 +-
pkg/lbm/LBMnode.hpp | 4 +-
pkg/pfv/DFNFlow.cpp | 186 +++-
pkg/pfv/FlowEngine.hpp | 18 +
pkg/pfv/FlowEngine.hpp.in | 55 +-
pkg/pfv/FlowEngine.ipp | 1 -
pkg/pfv/FlowEngine.ipp.in | 13 +-
pkg/pfv/TwoPhaseFlowEngine.cpp | 296 ++++++
pkg/pfv/TwoPhaseFlowEngine.hpp | 107 ++
pkg/pfv/UnsaturatedEngine.cpp | 1119 ++++++++++++++++++++
py/WeightedAverage2d.cpp | 2 +-
py/_polyhedra_utils.cpp | 12 +-
py/_utils.cpp | 76 +-
py/_utils.hpp | 148 +++
py/mathWrap/miniEigen.cpp | 4 +-
py/pack/_packObb.cpp | 6 +-
py/pack/_packPredicates.cpp | 6 +-
py/pack/_packSpheres.cpp | 18 +-
py/post2d.py | 7 +-
py/utils.py | 6 +-
py/wrapper/customConverters.cpp | 21 +-
py/wrapper/yadeWrapper.cpp | 44 +-
scripts/linkdeps.py | 2 +-
296 files changed, 4193 insertions(+), 2337 deletions(-)
diff --cc debian/changelog
index eda619c,3bb7942..490e83c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,24 @@@
+ yade (1.12.0-2) unstable; urgency=medium
+
+ * [24108c8] Use on i386 and kfreebsd-i386 compiler flags to reduce
+ RAM iconsumption during compilation.
+
+ -- Anton Gladky <gladk at debian.org> Fri, 24 Oct 2014 18:08:27 +0200
+
+ yade (1.12.0-1) unstable; urgency=medium
+
+ * [3bba065] Imported Upstream version 1.12.0. (Closes: #763259)
+ * [1ac4c00] Remove patch applied by upstream.
+ * [0b5f802] Set Standards-Version: 3.9.6. No changes.
+
+ -- Anton Gladky <gladk at debian.org> Mon, 20 Oct 2014 21:31:37 +0200
+
+yade (1.11.1-3~bpo70+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+
+ -- Anton Gladky <gladk at debian.org> Wed, 10 Sep 2014 17:54:58 +0200
+
yade (1.11.1-3) unstable; urgency=medium
* [dbf4ef8] Drop parallel builds.
--
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