lp:~bruno-chareyre/yade/collide

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~yade-dev/yade/trunk at revision 2922

Yade developers: Pending requested 2011-04-26

Diff: 552 lines (+194/-71)

9 files modified

core/Bound.hpp (+7/-0)
core/InteractionContainer.hpp (+3/-0)
pkg/common/Dispatching.cpp (+32/-2)
pkg/common/Dispatching.hpp (+6/-0)
pkg/common/InsertionSortCollider.cpp (+88/-43)
pkg/common/InsertionSortCollider.hpp (+22/-3)
pkg/common/InteractionLoop.cpp (+7/-3)
pkg/dem/NewtonIntegrator.cpp (+22/-20)
pkg/dem/NewtonIntegrator.hpp (+7/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2827. By Bruno Chareyre on 2011-04-26

- missing bracket

2826. By Bruno Chareyre on 2011-04-26

- fix commit mistake + documentation

2825. By Bruno Chareyre on 2011-04-26

-merge

2824. By Bruno Chareyre on 2011-04-26

-no change

2823. By Bruno Chareyre on 2011-04-26

- default params + a smarter inversion handling for not-overlapping bounds

2822. By Bruno Chareyre on 2011-04-26

- merge main into branch

2821. By Bruno Chareyre on 2011-04-26

Improve and clean the branch before merging.

2820. By Klaus Thoeni on 2011-04-18

1. move value which indicates how far interactions are from normal failing to WirePhys since only WirePM is using it

2819. By Klaus Thoeni on 2011-04-18

1. correct affiliation in doc/sphinx/conf.py
2. derive WirePM from FrictMat
3. add value which indicates how far interactions are from normal failing (currently just used in WirePM)

2818. By Janek Kozicki on 2011-04-16

last correction for simple scene energy tracking example - I forgot to commit changes in CohesiveFrictionalContactLaw
but in fact maybe better if those methods for calculating elastic normal & shear energy would be moved somewhere else, maybe to shop? I'm not sure.