[yade] 01/07: Merge tag 'upstream/1.14.0'
Anton Gladky
gladk at moszumanska.debian.org
Mon Jun 15 04:42:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository yade.
commit 138d1a6d70433ff02fc8f842e978ec782045a202
Merge: aefb87c cef3691
Author: Anton Gladky <gladk at debian.org>
Date: Mon Jun 1 19:54:22 2015 +0200
Merge tag 'upstream/1.14.0'
Upstream version 1.14.0
.mailmap | 38 +
ChangeLog | 168 +-
RELEASE | 2 +-
cMake/FindCGAL.cmake | 2 -
core/Body.hpp | 15 -
core/Clump.cpp | 29 +-
core/Scene.hpp | 12 +-
core/State.hpp | 17 +-
core/main/main.py.in | 2 +
doc/references.bib | 60 +-
doc/sphinx/FEMxDEM.rst | 68 +
doc/sphinx/bib2rst.py | 7 +-
doc/sphinx/formulation.rst | 9 +-
doc/sphinx/index-toctree.rst | 14 +-
doc/sphinx/installation.rst | 34 +-
doc/sphinx/introduction.rst | 13 +-
doc/sphinx/publications.rst.in | 8 +-
doc/sphinx/references.rst.in | 1 +
doc/sphinx/templates/index.html | 2 +
doc/sphinx/tutorial/06-periodic-triaxial-test.py | 2 +-
doc/sphinx/user.rst | 4 +-
doc/yade-articles.bib | 373 +-
doc/yade-conferences.bib | 217 +-
doc/yade-theses.bib | 64 +-
examples/FEMxDEM/biaxialSmooth.py | 82 +
examples/FEMxDEM/footing.msh | 7894 ++++++++++++++++++++
examples/FEMxDEM/footing.py | 81 +
examples/FEMxDEM/prepareRVE.py | 57 +
examples/FEMxDEM/retainingSmooth.py | 89 +
examples/FEMxDEM/triaxialRough.py | 81 +
examples/FEMxDEM/undrain.py | 86 +
examples/FluidCouplingPFV/oedometer.py | 22 +-
examples/ViscElMatchMaker.py | 15 +-
examples/capillary/liquidmigration/showcase.py | 34 +-
examples/clumps/triax-basic-with-clumps.py | 4 +-
examples/polyhedra/ball.py | 4 +-
examples/polyhedra/clump.py | 64 +
examples/polyhedra/free-fall.py | 12 +-
examples/polyhedra/horse.coarse.gts | 2007 +++++
examples/polyhedra/horse.ele | 1989 +++++
examples/polyhedra/horse.node | 705 ++
examples/polyhedra/horse.py | 36 +
examples/polyhedra/irregular.py | 4 +-
examples/polyhedra/sphere-interaction.py | 40 +
examples/polyhedra/textExport.py | 3 +
examples/polyhedra/wall.py | 4 +-
examples/test/clump-facet.py | 36 +
examples/test/triax-basic.py | 6 +-
examples/test/triax-cohesive.py | 6 +-
examples/triax-tutorial/script-session1.py | 20 +-
examples/triax-tutorial/script-session2.py | 14 +-
.../boost/math/detail/fp_traits.hpp | 1152 +--
.../boost/math/fpclassify.hpp | 458 +-
.../boost/math/nonfinite_num_facets.hpp | 950 +--
.../boost/math/signbit.hpp | 172 +-
gui/qt4/GLViewer.cpp | 12 +-
gui/qt4/GLViewerMouse.cpp | 6 +-
gui/qt4/_GLViewer.cpp | 8 +-
lib/base/Math.hpp | 1 +
lib/computational-geometry/Hull2d.hpp | 3 +-
lib/triangulation/FlowBoundingSphere.hpp | 4 +-
lib/triangulation/FlowBoundingSphere.ipp | 75 +-
lib/triangulation/FlowBoundingSphereLinSolv.hpp | 5 +-
lib/triangulation/FlowBoundingSphereLinSolv.ipp | 14 +-
lib/triangulation/Network.ipp | 4 +-
lib/triangulation/PeriodicFlow.hpp | 2 +-
lib/triangulation/PeriodicFlowLinSolv.hpp | 4 +-
pkg/common/ForceEngine.cpp | 123 +-
pkg/common/ForceEngine.hpp | 26 +-
pkg/common/SPHEngine.cpp | 155 +-
pkg/common/SPHEngine.hpp | 12 +-
pkg/dem/CapillaryPhys.hpp | 6 +-
pkg/dem/CapillaryStressRecorder.hpp | 2 +-
pkg/dem/CapillaryTriaxialTest.hpp | 4 +-
pkg/dem/CohesiveFrictionalContactLaw.cpp | 4 +-
pkg/dem/CohesiveFrictionalContactLaw.hpp | 5 +-
pkg/dem/CohesiveTriaxialTest.hpp | 4 +-
pkg/dem/ConcretePM.cpp | 6 +-
pkg/dem/DemXDofGeom.hpp | 2 +-
pkg/dem/Disp2DPropLoadEngine.cpp | 3 +-
pkg/dem/GlobalStiffnessTimeStepper.hpp | 2 +-
pkg/dem/HertzMindlin.hpp | 6 +-
pkg/dem/JointedCohesiveFrictionalPM.cpp | 40 +-
pkg/dem/JointedCohesiveFrictionalPM.hpp | 6 +-
pkg/dem/KinemC__Engine.cpp | 15 +-
pkg/dem/KinemC__Engine.hpp | 6 +-
pkg/dem/KinemSimpleShearBox.cpp | 19 -
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp | 105 +-
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp | 30 +-
pkg/dem/MicroMacroAnalyser.cpp | 6 +-
pkg/dem/MicroMacroAnalyser.hpp | 3 +-
pkg/dem/NewtonIntegrator.hpp | 2 +-
pkg/dem/NormalInelasticPM.hpp | 2 +-
pkg/dem/Polyhedra.cpp | 16 +-
pkg/dem/Polyhedra.hpp | 44 +-
pkg/dem/Polyhedra_Ig2.cpp | 161 +-
pkg/dem/Polyhedra_Ig2.hpp | 29 +-
pkg/dem/ScGeom.hpp | 4 +-
pkg/dem/Shop.hpp | 9 +
pkg/dem/Shop_02.cpp | 190 +
pkg/dem/SpherePack.hpp | 14 +-
pkg/dem/TesselationWrapper.hpp | 4 +
pkg/dem/ThreeDTriaxialEngine.hpp | 7 +-
pkg/dem/TriaxialCompressionEngine.cpp | 2 +-
pkg/dem/TriaxialCompressionEngine.hpp | 9 +-
pkg/dem/TriaxialStressController.cpp | 39 +-
pkg/dem/TriaxialStressController.hpp | 13 +-
pkg/dem/TriaxialTest.hpp | 4 +-
pkg/dem/VTKRecorder.cpp | 53 +-
pkg/dem/VTKRecorder.hpp | 4 +-
pkg/dem/ViscoelasticCapillarPM.cpp | 46 +-
pkg/dem/ViscoelasticCapillarPM.hpp | 4 +
pkg/dem/ViscoelasticPM.cpp | 6 +-
pkg/dem/ViscoelasticPM.hpp | 4 +-
pkg/pfv/DFNFlow.cpp | 66 +-
pkg/pfv/DummyFlowEngine.cpp | 2 +-
pkg/pfv/FlowEngine.hpp | 7 +-
pkg/pfv/FlowEngine.hpp.in | 13 +-
pkg/pfv/FlowEngine.ipp.in | 8 +
pkg/pfv/PeriodicFlowEngine.cpp | 12 +-
pkg/pfv/TwoPhaseFlowEngine.cpp | 242 +-
pkg/pfv/TwoPhaseFlowEngine.hpp | 53 +-
pkg/pfv/UnsaturatedEngine.cpp | 970 +--
py/CMakeLists.txt | 2 +
py/FEMxDEM/mpipool.py | 69 +
py/FEMxDEM/msFEM2D.py | 261 +
py/FEMxDEM/msFEM3D.py | 223 +
py/FEMxDEM/msFEMup.py | 293 +
py/FEMxDEM/saveGauss.py | 32 +
py/FEMxDEM/simDEM.py | 255 +
py/_polyhedra_utils.cpp | 2 +-
py/_utils.cpp | 13 +-
py/_utils.hpp | 4 +-
py/export.py | 54 +-
py/pack/pack.py | 2 +-
py/plot.py | 5 +-
py/utils.py | 11 +-
py/wrapper/yadeWrapper.cpp | 32 +-
py/ymport.py | 45 +
scripts/checks-and-tests/checks/DEM-PFV-check.py | 16 +-
.../checks/checkLiquidMigration.py | 30 +-
scripts/checks-and-tests/checks/checkTestTriax.py | 14 +-
142 files changed, 18642 insertions(+), 2776 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