yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Anton Gladky (gladky-anton)
  Chareyre (bruno-chareyre)
  Václav Šmilauer (eudoxos)
------------------------------------------------------------
revno: 2610 [merge]
committer: Sergei D. <sega@think>
branch nick: trunk
timestamp: Sun 2010-12-19 12:58:59 +0300
message:
  merge with trunk
removed:
  SConscript-mono
added:
  ChangeLog
  debian/source/
  debian/source/format
renamed:
  pkg/common/SubdomainOptimizer.cpp => pkg/common/SubdomainBalancer.cpp
  pkg/common/SubdomainOptimizer.hpp => pkg/common/SubdomainBalancer.hpp
  scripts/test/subdomain-optimizer.py => scripts/test/subdomain-balancer.py
modified:
  SConstruct
  core/Interaction.hpp
  core/State.cpp
  core/State.hpp
  core/main/yade-batch.in
  doc/yade-articles.bib
  examples/packs/packs.py
  pkg/common/Cylinder.cpp
  pkg/common/Cylinder.hpp
  pkg/common/Dispatching.cpp
  pkg/common/Dispatching.hpp
  pkg/common/InteractionLoop.cpp
  pkg/dem/ConcretePM.cpp
  pkg/dem/ConcretePM.hpp
  pkg/dem/Dem3DofGeom_FacetSphere.cpp
  pkg/dem/Dem3DofGeom_FacetSphere.hpp
  pkg/dem/Dem3DofGeom_SphereSphere.cpp
  pkg/dem/Dem3DofGeom_SphereSphere.hpp
  pkg/dem/Dem3DofGeom_WallSphere.cpp
  pkg/dem/Dem3DofGeom_WallSphere.hpp
  pkg/dem/DemXDofGeom.hpp
  pkg/dem/DomainLimiter.cpp
  pkg/dem/DomainLimiter.hpp
  pkg/dem/ElasticContactLaw.cpp
  pkg/dem/Ig2_Box_Sphere_ScGeom.cpp
  pkg/dem/Ig2_Box_Sphere_ScGeom.hpp
  pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp
  pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp
  pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp
  pkg/dem/L3Geom.cpp
  pkg/dem/L3Geom.hpp
  pkg/dem/NewtonIntegrator.cpp
  pkg/dem/NozzleFactory.hpp
  pkg/dem/ScGeom.cpp
  pkg/dem/TriaxialCompressionEngine.hpp
  pkg/dem/TriaxialStressController.hpp
  pkg/dem/WirePM.hpp
  py/_eudoxos.cpp
  py/_extraDocs.py
  py/system.py
  py/tests/omega.py
  py/tests/pbc.py
  scripts/test/chained-cylinder-roots.py
  scripts/test/clumpPack.py
  scripts/test/law-test.py
  pkg/common/SubdomainBalancer.cpp
  pkg/common/SubdomainBalancer.hpp
  scripts/test/subdomain-balancer.py
The size of the diff (2143 lines) is larger than your specified limit of 1000 lines

--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription