[yade] 09/10: Merge tag 'upstream/1.00.0'
Anton Gladky
gladk at alioth.debian.org
Mon Sep 30 19:08:37 UTC 2013
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository yade.
commit 630bfc8a3347c5253b24578c7ea8f2c2ef567e0d
Merge: 9edd741 b3f639e
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Mon Sep 30 19:20:09 2013 +0200
Merge tag 'upstream/1.00.0'
Upstream version 1.00.0
.gitignore | 1 +
.kdev4/yade.kdev4 | 35 -
CMakeLists.txt | 77 +-
ChangeLog | 4825 ++++++++++++++++++++
RELEASE | 2 +-
Yade.kdevelop | 229 -
cMake/FindCholmod.cmake | 41 +-
cMake/FindLoki.cmake | 2 +-
cMake/FindMetis.cmake | 16 +
cMake/FindOpenBlas.cmake | 14 +
core/Cell.hpp | 12 +-
core/Clump.cpp | 159 +-
core/Clump.hpp | 2 +-
core/Engine.hpp | 2 +-
core/ForceContainer.hpp | 88 +-
core/Functor.hpp | 2 +-
core/Scene.cpp | 6 +-
core/main/main.py.in | 13 +-
core/main/yade-batch.in | 20 +-
doc/references.bib | 104 +-
doc/sphinx/conf.py | 2 +-
doc/sphinx/fig/micro-domains.png | Bin 0 -> 37528 bytes
doc/sphinx/formulation.rst | 78 +-
doc/sphinx/installation.rst | 23 +-
doc/sphinx/introduction.rst | 6 +-
doc/sphinx/prog.rst | 8 +-
doc/sphinx/references.bib | 40 +-
doc/sphinx/templates/index.html | 12 +-
doc/sphinx/user.rst | 262 +-
doc/sphinx/yadeSphinx.py | 6 +-
doc/yade-articles.bib | 841 ++--
doc/yade-conferences.bib | 98 +-
doc/yade-theses.bib | 20 +-
examples/CapillaryPhys-example.py | 4 +-
examples/FluidCouplingPFV/oedometer.py | 165 +
examples/LudingPM.py | 67 +
examples/PIDController.py | 57 +
examples/clumps/adaptClumpMasses-example.py | 54 -
examples/clumps/addToClump-example.py | 6 +-
examples/clumps/apply-buoyancy-clumps.py | 145 +
examples/clumps/releaseFromClump-example.py | 4 +-
examples/concrete/triax.py | 209 +
examples/concrete/uniax.py | 14 +-
examples/gts-horse/gts-random-pack-obb.py | 8 +-
examples/gts-horse/gts-random-pack.py | 10 +-
examples/jointedCohesiveFrictionalPM/README | 13 +
.../jointedCohesiveFrictionalPM/gravityLoading.py | 152 +
.../gravityLoading_velocityField_arrows.png | Bin 0 -> 277752 bytes
.../gravityLoading_velocityField_spheres.png | Bin 0 -> 147381 bytes
.../identificationSpheresOnJoint.py | 209 +
.../jointedCohesiveFrictionalPM/jointedModel.png | Bin 0 -> 221911 bytes
.../packInGtsSurface.py | 46 +
.../parallellepiped.gts | 39 +
.../persistentPlane30Deg.stl | Bin 0 -> 884 bytes
examples/periodicSandPile.py | 2 +-
examples/polyhedra/oneTetra.py | 43 +
examples/polyhedra/twoTetras.py | 111 +
examples/rotationalResistance.py | 46 +
examples/simple-shear/simpleShear.py | 13 +-
examples/{test => }/spheresFactory.py | 5 +-
examples/tesselationwrapper/tesselationWrapper.py | 2 +
examples/test/CundallStrackTest.py | 21 -
examples/test/Dem3DofGeom.py | 40 -
examples/test/vtk-exporter/vtkExporter.py | 13 +-
examples/timeStepperUsage.py | 2 +-
examples/triax-tutorial/script-session1.py | 2 +-
examples/tunnel-pack.py | 14 +-
gui/CMakeLists.txt | 5 +-
gui/qt4/OpenGLManager.cpp | 2 +-
lib/base/Math.hpp | 31 +-
lib/import/STLReader.hpp | 17 +-
lib/opengl/GLUtils.cpp | 3 +-
lib/opengl/OpenGLWrapper.hpp | 57 +-
lib/triangulation/FlowBoundingSphere.cpp | 2 +-
lib/triangulation/FlowBoundingSphere.hpp | 345 +-
lib/triangulation/FlowBoundingSphere.ipp | 190 +-
lib/triangulation/FlowBoundingSphereLinSolv.hpp | 192 +
lib/triangulation/FlowBoundingSphereLinSolv.ipp | 995 ++++
lib/triangulation/Network.hpp | 42 +-
lib/triangulation/Network.ipp | 73 +-
lib/triangulation/PeriodicFlow.hpp | 5 +-
lib/triangulation/PeriodicFlowLinSolv.hpp | 36 +
lib/triangulation/PeriodicFlowLinSolv.ipp | 325 ++
lib/triangulation/RegularTriangulation.h | 1 -
lib/triangulation/Tenseur3.h | 229 +-
lib/triangulation/TriaxialState.h | 5 +-
lib/triangulation/def_types.h | 448 +-
pkg/common/Cylinder.cpp | 8 +-
pkg/common/Cylinder.hpp | 6 +-
pkg/common/Facet.cpp | 4 +-
pkg/common/Facet.hpp | 3 +-
pkg/common/Gl1_NormPhys.cpp | 137 +-
pkg/common/Gl1_Sphere.cpp | 2 +-
pkg/common/Grid.cpp | 150 +
pkg/common/Grid.hpp | 45 +-
pkg/common/InsertionSortCollider.cpp | 1 -
pkg/common/KinematicEngines.cpp | 42 +-
pkg/common/KinematicEngines.hpp | 22 +
pkg/common/OpenGLRenderer.cpp | 2 +-
pkg/common/OpenGLRenderer.hpp | 1 +
pkg/dem/BubbleMat.cpp | 78 +
pkg/dem/BubbleMat.hpp | 75 +
pkg/dem/CapillaryPhys.hpp | 15 +-
pkg/dem/CapillaryStressRecorder.cpp | 14 +-
pkg/dem/CapillaryTriaxialTest.cpp | 2 +-
pkg/dem/CapillaryTriaxialTest.hpp | 2 +-
pkg/dem/CohesiveFrictionalContactLaw.hpp | 2 -
pkg/dem/CohesiveFrictionalPM.cpp | 200 -
pkg/dem/CohesiveFrictionalPM.hpp | 114 -
pkg/dem/CohesiveStateRPMRecorder.cpp | 19 -
pkg/dem/CohesiveStateRPMRecorder.hpp | 19 -
pkg/dem/ConcretePM.cpp | 48 +-
pkg/dem/ConcretePM.hpp | 5 +-
pkg/dem/Dem3DofGeom_FacetSphere.cpp | 221 -
pkg/dem/Dem3DofGeom_FacetSphere.hpp | 80 -
pkg/dem/Dem3DofGeom_SphereSphere.cpp | 196 -
pkg/dem/Dem3DofGeom_SphereSphere.hpp | 80 -
pkg/dem/Dem3DofGeom_WallSphere.cpp | 117 -
pkg/dem/Dem3DofGeom_WallSphere.hpp | 70 -
pkg/dem/DemXDofGeom.cpp | 4 +-
pkg/dem/DemXDofGeom.hpp | 46 +-
pkg/dem/DomainLimiter.cpp | 16 +-
pkg/dem/FlowEngine.cpp | 227 +-
pkg/dem/FlowEngine.hpp | 161 +-
pkg/dem/GlobalStiffnessTimeStepper.cpp | 83 +-
pkg/dem/GlobalStiffnessTimeStepper.hpp | 7 +-
pkg/dem/HertzMindlin.cpp | 56 +-
pkg/dem/HertzMindlin.hpp | 7 +-
pkg/dem/InelastCohFrictMat.hpp | 59 +-
pkg/dem/InelastCohFrictPhys.cpp | 15 +-
pkg/dem/InelastCohFrictPhys.hpp | 96 +-
...p2_2xInelastCohFrictMat_InelastCohFrictPhys.cpp | 122 +-
...p2_2xInelastCohFrictMat_InelastCohFrictPhys.hpp | 10 +-
pkg/dem/Ip2_ElastMat.cpp | 64 +
pkg/dem/Ip2_ElastMat.hpp | 24 +
.../Ip2_FrictMat_FrictMat_MindlinCapillaryPhys.hpp | 14 +-
pkg/dem/JointedCohesiveFrictionalPM.cpp | 235 +
pkg/dem/JointedCohesiveFrictionalPM.hpp | 110 +
pkg/dem/KinemCTDEngine.hpp | 3 +-
pkg/dem/KinemSimpleShearBox.cpp | 2 +-
pkg/dem/L3Geom.cpp | 16 +-
pkg/dem/L3Geom.hpp | 2 +-
...ScGeom6D_InelastCohFrictPhys_CohesionMoment.cpp | 371 +-
...ScGeom6D_InelastCohFrictPhys_CohesionMoment.hpp | 23 +-
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp | 31 +-
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp | 10 +-
pkg/dem/LudingPM.cpp | 177 +
pkg/dem/LudingPM.hpp | 65 +
pkg/dem/NewtonIntegrator.cpp | 2 +-
pkg/dem/NewtonIntegrator.hpp | 4 +-
pkg/dem/ParticleSizeDistrbutionRPMRecorder.cpp | 293 --
pkg/dem/ParticleSizeDistrbutionRPMRecorder.hpp | 51 -
pkg/dem/PeriIsoCompressor.cpp | 9 +-
pkg/dem/PeriIsoCompressor.hpp | 23 +-
pkg/dem/RockPM.cpp | 202 -
pkg/dem/RockPM.hpp | 96 -
pkg/dem/SampleCapillaryPressureEngine.cpp | 4 +-
pkg/dem/Shop.cpp | 102 +-
pkg/dem/Shop.hpp | 7 +-
pkg/dem/SpherePack.cpp | 29 +-
pkg/dem/SpherePack.hpp | 2 +-
pkg/dem/TesselationWrapper.hpp | 2 +-
pkg/dem/Tetra.cpp | 654 ++-
pkg/dem/Tetra.hpp | 120 +-
pkg/dem/TriaxialStateRecorder.hpp | 1 -
pkg/dem/TriaxialStressController.cpp | 8 +
pkg/dem/TriaxialStressController.hpp | 4 +-
pkg/dem/TriaxialTest.hpp | 2 +-
pkg/dem/VTKRecorder.cpp | 25 +-
pkg/dem/VTKRecorder.hpp | 2 +-
pkg/dem/ViscoelasticCapillarPM.cpp | 138 +
pkg/dem/ViscoelasticPM.cpp | 121 +-
pkg/dem/ViscoelasticPM.hpp | 26 +-
pkg/dem/WirePM.cpp | 183 +-
pkg/dem/WirePM.hpp | 40 +-
py/CMakeLists.txt | 19 +-
py/_eudoxos.cpp | 335 --
py/_extraDocs.py | 3 +-
py/_utils.cpp | 119 +-
py/eudoxos.py | 311 --
py/export.py | 168 +-
py/mathWrap/miniEigen.cpp | 4 +
py/pack/_packSpheres.cpp | 2 +-
py/pack/pack.py | 11 +-
py/system.py | 2 -
py/tests/__init__.py | 4 +-
py/tests/clump.py | 4 +-
py/utils.py | 113 +-
py/wrapper/yadeWrapper.cpp | 207 +-
py/ymport.py | 9 +-
scripts/checks-and-tests/checks/DEM-PFV-check.py | 146 +
scripts/checks-and-tests/checks/README | 2 +
scripts/checks-and-tests/checks/checkGravity.py | 2 -
scripts/checks-and-tests/checks/checkList.py | 16 +-
scripts/checks-and-tests/checks/checkTestDummy.py | 7 +
scripts/checks-and-tests/checks/checkTestTriax.py | 3 +
scripts/checks-and-tests/checks/checkWirePM.py | 147 +
scripts/checks-and-tests/checks/data/100spheres | 100 +
yade.kdev4 | 3 -
199 files changed, 13654 insertions(+), 5634 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