Merge lp://qastaging/~bruno-chareyre/yade/collide into lp://qastaging/~yade-dev/yade/trunk
Proposed by
Bruno Chareyre
| Status: | Merged |
|---|---|
| Merged at revision: | 2922 |
| Proposed branch: | lp://qastaging/~bruno-chareyre/yade/collide |
| Merge into: | lp://qastaging/~yade-dev/yade/trunk |
| Diff against target: |
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) |
| To merge this branch: | bzr merge lp://qastaging/~bruno-chareyre/yade/collide |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Yade developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Improved colliding (only implemented for non-periodic BCs at the moment).
- Some useless operations are removed (see diff).
- The behaviour with nBins=0 tracks displacements (while nBins>0 tracks max velocity) to update bounds
- Experimental features: targetInterval (adjust bound sizes so that they will be updated each N iterations), updatingDispFactor (only update bounds where the body's motion is at least boundSize/factor, hence saving sorting time).
Overall CPU time reduced by a factor 0.6 (average).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
