yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Václav Šmilauer (eudoxos)
------------------------------------------------------------
revno: 2579 [merge]
committer: Václav Šmilauer <eu@xxxxxxxx>
branch nick: yade
timestamp: Tue 2010-11-30 14:51:41 +0100
message:
  1. Merge the subdomain branch, enable subdomains feature to enable
  2. Delete some obsolete code in scons
added:
  pkg/common/SubdomainOptimizer.cpp
  pkg/common/SubdomainOptimizer.hpp
  scripts/test/subdomain-optimizer.py
modified:
  CMakeLists.txt
  SConscript
  SConstruct
  core/Body.hpp
  core/BodyContainer.cpp
  core/BodyContainer.hpp
  core/Bound.hpp
  core/InteractionContainer.cpp
  core/InteractionContainer.hpp
  core/PartialEngine.hpp
  core/Scene.cpp
  core/main/main.py.in
  core/main/yade-batch.in
  examples/regular-sphere-pack/regular-sphere-pack.py
  gui/qt4/GLViewer.cpp
  lib/base/Math.hpp
  pkg/common/ForceResetter.cpp
  pkg/common/GravityEngines.cpp
  pkg/common/GravityEngines.hpp
  pkg/common/InsertionSortCollider.cpp
  pkg/common/InsertionSortCollider.hpp
  pkg/common/InteractionLoop.cpp
  pkg/common/OpenGLRenderer.cpp
  pkg/common/OpenGLRenderer.hpp
  pkg/dem/ElasticContactLaw.cpp
  pkg/dem/HertzMindlin.hpp
  pkg/dem/NewtonIntegrator.cpp
  py/__init__.py.in
  py/pack/_packPredicates.cpp
  py/pack/pack.py
  py/wrapper/yadeWrapper.cpp
  scripts/test/batch/params.table
  scripts/test/batch/sim.py
The size of the diff (2192 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