Merge authors: Chareyre (bruno-chareyre) Related merge proposals: https://code.launchpad.net/~bruno-chareyre/yade/collide/+merge/59029 proposed by: Chareyre (bruno-chareyre) ------------------------------------------------------------ revno: 2922 [merge] committer: Bruno Chareyre <[email protected]> branch nick: yade timestamp: Mon 2011-09-19 22:40:55 +0200 message: - yet more optimmizations + a new collider (slower than insertion sort but quite simple and maybe parallelized in the future when parallel CGAL is released) 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/ViscoelasticPM.cpp pkg/dem/WirePM.cpp The size of the diff (1283 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
