[yade] 01/04: Merge tag 'upstream/2017.01a'
Anton Gladky
gladk at moszumanska.debian.org
Fri Jan 20 17:00:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository yade.
commit 31582eb68ae9970948ef8a45533998bd114d5e8f
Merge: 80cdcd1 4b5edc3
Author: Anton Gladky <gladk at debian.org>
Date: Thu Jan 19 22:43:30 2017 +0100
Merge tag 'upstream/2017.01a'
Upstream version 2017.01a
CMakeLists.txt | 40 +-
ChangeLog | 108 +
RELEASE | 2 +-
cMake/FindCLP.cmake | 42 +
core/Clump.cpp | 234 +-
core/Clump.hpp | 6 +-
core/PartialEngine.hpp | 4 +-
core/main/main.py.in | 11 +-
doc/citing_yade.bib | 8 +-
doc/how-to-release.md | 12 +
doc/sphinx/book/confBook.py | 12 +-
doc/sphinx/book/confManual.py | 12 +-
doc/sphinx/book/confReference.py | 12 +-
doc/sphinx/book/confTheory.py | 12 +-
doc/sphinx/conf.py | 83 +-
doc/sphinx/installation.rst | 29 +-
doc/sphinx/ipython_directive500.py | 1184 ++++++++
doc/sphinx/tutorial/01-bouncing-sphere.py | 4 +-
doc/sphinx/tutorial/02-gravity-deposition.py | 4 +-
doc/sphinx/tutorial/03-oedometric-test.py | 4 +-
doc/sphinx/tutorial/04-periodic-simple-shear.py | 4 +-
doc/sphinx/tutorial/05-3d-postprocessing.py | 4 +-
doc/sphinx/user.rst | 26 +-
doc/yade-articles.bib | 97 +-
doc/yade-conferences.bib | 33 +
doc/yade-theses.bib | 8 +
examples/HydroForceEngine/buoyantParticles.py | 104 +
examples/HydroForceEngine/fluidizedBed.py | 172 ++
.../HydroForceEngine/sedimentTransportExample.py | 421 +++
examples/PotentialBlocks/cubePBscaled.py | 298 ++
.../CapillaryPhys-example.py | 0
examples/capillaryLaplaceYoung/README.txt | 35 +
examples/capillaryLaplaceYoung/capillaryBridge.py | 50 +
examples/capillaryLaplaceYoung/solveLaplace_uc.m | 105 +
examples/capillaryLaplaceYoung/solveLiqBridge.m | 279 ++
examples/capillaryLaplaceYoung/writesCapFile.m | 255 ++
examples/cylinders/cylinderconnection-roots.py | 6 +-
examples/polyhedra/splitter.py | 54 +
examples/test/pack-inConvexPolyhedron.py | 62 +
gui/qt5/__init__.py | 25 +-
lib/base/Math.hpp | 3 +-
lib/serialization/Serializable.cpp | 2 -
lib/triangulation/FlowBoundingSphere.hpp | 2 +-
lib/triangulation/FlowBoundingSphere.ipp | 43 +-
lib/triangulation/FlowBoundingSphereLinSolv.ipp | 11 +-
lib/triangulation/Network.hpp | 3 +-
lib/triangulation/Network.ipp | 68 +-
lib/triangulation/PeriodicFlow.hpp | 18 +-
lib/triangulation/RegularTriangulation.h | 18 +-
lib/triangulation/Tesselation.h | 2 +
lib/triangulation/Tesselation.ipp | 10 +
pkg/common/ForceEngine.cpp | 61 +-
pkg/common/ForceEngine.hpp | 2 +
pkg/common/Gl1_PotentialBlock.cpp | 1102 ++++++++
pkg/common/Gl1_PotentialBlock.hpp | 196 ++
pkg/common/InsertionSortCollider.cpp | 3 +
pkg/common/InteractionLoop.cpp | 17 +-
pkg/common/InteractionLoop.hpp | 8 +-
pkg/common/KinematicEngines.hpp | 6 +-
pkg/dem/BlockGen.cpp | 2882 ++++++++++++++++++++
pkg/dem/BlockGen.hpp | 260 ++
pkg/dem/BubbleMat.hpp | 2 +-
pkg/dem/CapillaryPhys.hpp | 2 +
pkg/dem/ConcretePM.cpp | 7 +-
pkg/dem/ConcretePM.hpp | 2 +-
pkg/dem/DelaunayInterpolation.hpp | 1 -
pkg/dem/Ig2_PB_PB_ScGeom.cpp | 2639 ++++++++++++++++++
pkg/dem/Ig2_PB_PB_ScGeom.hpp | 147 +
pkg/dem/KnKsPBLaw.cpp | 646 +++++
pkg/dem/KnKsPBLaw.hpp | 198 ++
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp | 111 +-
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp | 9 +-
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity1.cpp | 7 +-
pkg/dem/MortarMat.hpp | 2 +-
pkg/dem/PotentialBlock.cpp | 106 +
pkg/dem/PotentialBlock.hpp | 122 +
pkg/dem/PotentialBlock2AABB.cpp | 57 +
pkg/dem/PotentialBlock2AABB.hpp | 24 +
pkg/dem/RockBolt.cpp | 611 +++++
pkg/dem/RockBolt.hpp | 112 +
pkg/dem/RockLiningGlobal.cpp | 772 ++++++
pkg/dem/RockLiningGlobal.hpp | 167 ++
pkg/dem/STLImporter.hpp | 17 +-
pkg/dem/ScGeom.cpp | 15 +
pkg/dem/ScGeom.hpp | 2 +
pkg/dem/TriaxialStressController.hpp | 2 +-
pkg/dem/ViscoelasticPM.cpp | 7 +-
.../DeformableCohesiveElement.hpp | 2 +
pkg/pfv/FlowEngine.hpp.in | 20 +-
pkg/pfv/FlowEngine.ipp.in | 37 +-
pkg/pfv/TwoPhaseFlowEngine.cpp | 569 +++-
pkg/pfv/TwoPhaseFlowEngine.hpp | 148 +-
pkg/pfv/UnsaturatedEngine.cpp | 465 +---
py/3rd-party/pygts-0.3.1/pygts.c | 5 -
py/_polyhedra_utils.cpp | 21 +-
py/_utils.cpp | 6 +-
py/_utils.hpp | 2 -
py/pack/pack.py | 72 +
py/utils.py | 7 +-
py/wrapper/yadeWrapper.cpp | 49 +
scripts/HTML.py | 493 ----
scripts/default-test.py | 110 -
scripts/hackett-warn-replace.py | 205 --
scripts/hackett.py | 243 --
scripts/installOnUbuntu.sh | 24 -
scripts/make-release.sh | 13 -
scripts/regression-tests.py | 20 -
scripts/scanreplace.py | 19 -
scripts/yade-exec-wrapper | 22 -
scripts/ysl1.py | 79 -
110 files changed, 14917 insertions(+), 2079 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