GitLab

Reason: using --unicode-literals everywhere is not a good approach.

This reverts commit 323836e9.

futurize --stage1 --unicode-literals `echo $(find -name "*.py*") ./core/main/yade-batch.in ./core/main/yade-oar.in`

- remove the velocityBins lines in tests since velocityBins are removed from trunk

2. Fix some scripts in scripts/test

1. Renames as discussed on yade-dev: NewtonsDampedLaw -> NewtonIntegrator, StandAloneEngine -> GlobalEngine, DeusExMachina -> PartialEngine. Regression tests ok.
2. Rename the confusing scons 'pretty' option to 'brief'. Profiles will be updated automatically, both options are valid for now.

ef2_Sphere_Sphere_Dem3Dof: change meaning of distanceFactor, see docs (if < 0, equilibrium is sum of radii, otherwise the initial distance; defaults to -1). Renamed to distFactor, to break old code intentionally
InteractingSphere2AABB: allow negative aabbEnlargeFactor, which doesn't scale aabb at all (same as if it is 1.)
yade-multi: use the first non-blank line as column headings (not necessarily the first line of the file, as is used to be)
SpatialQuickSortCollider: fix clearing interaction with openMP
examples/concrete/uniaxial: move files around, add confinement and docs; remove examples/concrete/pack since not in the pack module (an example should be given, though)
examples/collider-perf: remove PersistentSAPCollider, add InsertionSortCollide with strides, but commented out since no effect at hthe beginning of simulation
PeriodicInsertionSortCollider: remove unnecessary (hopefully) condition that would abort in scripts/test/periodic-simple.py

1. Add velocity binning for collision optimization: requires cooperation of NewtonsDampedLaw, BoundingVolumeMetaEngine and InsertionSortCollider.
2. Remove time-based sweeping from BoundingVOlumeMetaEngine.
3. QtGUI doesn't show annoying warning when run from python session anymore.

1. Handle clumps in a better way in NewtonsDampedLaw (only if asked by the clump itself) -- future parallelization work. (related to bug #398086)
2. InsertionSortCollider now knows when to run based on maximum distance the fastest body could have travelled. (It is actually the physical meaning of sweepDistance). Handle varying maxVelocitySq in a constitent way.
3. Add InteractionContainer::serializeSorted to sort interactions by id1 and id2 before serializing (useful for comparing XML files). Added Interaction::operator< to compare 2 interactions in that way.
4. Fix openMP strategy in InteractionDispatchers to "guided" (as per https://blueprints.launchpad.net/yade/+spec/omp-schedule-strategy)

2. Make InsertionSortCollider find NewtonsDampedLaw and get max speed from there. Together with InsertionSortColider::sweepLength, this makes stride adapted automatically to maxVelocitySq; this will described at http://yade.wikia.com/wiki/Insertion_Sort_Collider_Stride. 
3. Update test script for that.

2. Add maxVelocitySq to NewtonsDampedLaw for analysis purposes
3. Add BoundingVolumeMetaEngine::sweepTime and ::sweepDist to sweep bounding volume by given predicted motion over time or by given absolute distance.
4. Add strided run support to InsertionSortCollider (using sweeping)
5. Add scripts/test/collider-stride-triax.py to play with the strategies of sweeping based on strides
6. Add O.interactions.countReal()