------------------------------------------------------------ revno: 3000 committer: Bruno Chareyre <[email protected]> branch nick: yade timestamp: Mon 2012-01-23 15:43:54 +0100 message: Merge the "collide" branch to trunk (branch history at https://code.launchpad.net/~bruno-chareyre/yade/collide2) Summary: - the stride logic is improved by using displacements instead of velocities. Reference position and sweepLength are added to bounds. - the sweepLength of each body is updated in collider::action() according to collider's targetInterv, so that ideally all bodies leave their bounds at the same iteration (more or less the same idea as in the old velocityBin but with per-body logic) - a number of optimizations in the collider and interaction dispatcher. Namely, the handling of virtual interactions is a lot faster, allowing a larger number of them for the optimal verletDist. - timings reported at https://yade-dem.org/wiki/Colliders_performace (please add your reports there), roughly x3 speedup vs. bzr2999 in triaxial simulations - A new ZECollider is introduced, using CGAL's dD intersection algorithm. It is relatively slow and therefore not recommended, but the code is very short and it may be worth a try when parallel CGAL is released. - Added references to some CGAL packages and a few fixes in references. removed: pkg/common/VelocityBins.cpp pkg/common/VelocityBins.hpp added: pkg/common/ZECollider.cpp pkg/common/ZECollider.hpp modified: core/Bound.hpp core/InteractionContainer.cpp core/InteractionContainer.hpp pkg/common/Collider.hpp pkg/common/Cylinder.cpp pkg/common/Dispatching.cpp pkg/common/Dispatching.hpp pkg/common/InsertionSortCollider.cpp pkg/common/InsertionSortCollider.hpp pkg/common/InteractionLoop.cpp pkg/common/InteractionLoop.hpp pkg/dem/CohesionlessMomentRotation.cpp pkg/dem/CohesiveFrictionalContactLaw.cpp pkg/dem/CohesiveFrictionalPM.cpp pkg/dem/ConcretePM.cpp pkg/dem/CundallStrack.cpp pkg/dem/ElasticContactLaw.cpp pkg/dem/HertzMindlin.cpp pkg/dem/L3Geom.cpp pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp pkg/dem/NewtonIntegrator.cpp pkg/dem/NewtonIntegrator.hpp pkg/dem/NormalInelasticityLaw.cpp pkg/dem/RockPM.cpp pkg/dem/TesselationWrapper.cpp pkg/dem/TriaxialTest.cpp pkg/dem/ViscoelasticPM.cpp pkg/dem/WirePM.cpp The size of the diff (1608 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 _______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
