Merge authors: Václav Šmilauer (eudoxos) ------------------------------------------------------------ revno: 2178 [merge] fixes bug(s): https://launchpad.net/bugs/394687 committer: Václav Šmilauer <[email protected]> branch nick: trunk timestamp: Sun 2010-04-25 17:46:26 +0200 message: 1. Replace things for eigen compatibility. See https://www.yade-dem.org/wiki/Wm3%E2%86%92Eigen for details. Code should not be changed functionally. Report if it is. 2. Remove PositionOrientationRecorder from everywhere. 3. Make the timestep entry behave differently: only when enter is pressed, it will change timestep. Fixes bug #394687 removed: lib/computational-geometry/MarchingCube.cpp lib/computational-geometry/MarchingCube.hpp pkg/dem/Engine/GlobalEngine/PositionOrientationRecorder.cpp pkg/dem/Engine/GlobalEngine/PositionOrientationRecorder.hpp added: lib/miniWm3/EigenCompat.h modified: SConstruct attic/pkg/common/Engine/Functor/CundallNonViscousDamping.cpp attic/pkg/common/Engine/Functor/LeapFrogOrientationIntegrator.cpp attic/pkg/common/Engine/PartialEngine/DisplacementToForceEngine.cpp attic/pkg/dem/Engine/GlobalEngine/ForceSnapshot.cpp attic/pkg/dem/Engine/GlobalEngine/PositionRecorder.cpp attic/pkg/dem/Engine/GlobalEngine/PositionSnapshot.cpp attic/pkg/dem/PreProcessor/Funnel.cpp attic/pkg/dem/PreProcessor/MembraneTest.cpp attic/pkg/dem/PreProcessor/SDECImpactTest.cpp attic/pkg/dem/PreProcessor/SDECLinkedSpheres.cpp attic/pkg/dem/PreProcessor/SDECMovingWall.cpp attic/pkg/dem/PreProcessor/SDECSpheresPlane.cpp attic/pkg/dem/PreProcessor/SimpleScene.cpp attic/pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp attic/pkg/dem/PreProcessor/ThreePointBending.cpp attic/pkg/lattice/PreProcessor/LatticeExample.cpp attic/pkg/lattice/PreProcessor/LatticeExampleCTData.cpp attic/pkg/lattice/PreProcessor/LatticeExampleSimple.cpp attic/pkg/snow/PreProcessor/SnowCreepTest.cpp attic/pkg/snow/PreProcessor/SnowVoxelsLoader.cpp core/Bound.hpp core/Cell.cpp core/Cell.hpp core/ForceContainer.hpp core/State.hpp gui/qt3/GLViewer.cpp gui/qt3/QtGeneratedSimulationController.ui gui/qt3/SimulationController.cpp gui/qt3/SimulationController.hpp lib/SConscript lib/base/yadeWm3Extra.cpp lib/base/yadeWm3Extra_dont_include_directly.hpp lib/base/yadeWm3_dont_include_directly.hpp lib/miniWm3/Wm3Matrix3.h lib/miniWm3/Wm3Quaternion.h lib/miniWm3/Wm3Vector2.h lib/miniWm3/Wm3Vector3.h lib/miniWm3/Wm3Vector3.inl lib/opengl/GLUtils.cpp lib/serialization/KnownFundamentalsHandler.tpp pkg/common/DataClass/InteractionPhysics/NormShearPhys.hpp pkg/common/DataClass/Shape/Facet.cpp pkg/common/DataClass/VelocityBins.hpp pkg/common/Engine/Dispatcher/InteractionDispatchers.cpp pkg/common/Engine/Dispatcher/InteractionGeometryDispatcher.cpp pkg/common/Engine/Dispatcher/LawFunctor.hpp pkg/common/Engine/Functor/Bo1_Box_Aabb.cpp pkg/common/Engine/GlobalEngine/InsertionSortCollider.cpp pkg/common/Engine/GlobalEngine/ResetRandomPosition.cpp pkg/common/Engine/GlobalEngine/ResetRandomPosition.hpp pkg/common/Engine/PartialEngine/ForceEngine.hpp pkg/common/Engine/PartialEngine/GravityEngines.cpp pkg/common/Engine/PartialEngine/GravityEngines.hpp pkg/common/Engine/PartialEngine/JumpChangeSe3.hpp pkg/common/Engine/PartialEngine/MomentEngine.hpp pkg/common/Engine/PartialEngine/RotationEngine.hpp pkg/common/RenderingEngine/GLDrawFunctors.hpp pkg/common/RenderingEngine/OpenGLRenderingEngine.cpp pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp pkg/dem/DataClass/Clump.cpp pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_FacetSphere.cpp pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_FacetSphere.hpp pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_SphereSphere.cpp pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_SphereSphere.hpp pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_WallSphere.cpp pkg/dem/DataClass/InteractionGeometry/ScGeom.cpp pkg/dem/DataClass/InteractionGeometry/ScGeom.hpp pkg/dem/DataClass/InteractionPhysics/CapillaryPhys.hpp pkg/dem/DataClass/InteractionPhysics/FrictPhys.hpp pkg/dem/DataClass/InteractionPhysics/NormalInelasticityPhys.hpp pkg/dem/DataClass/SpherePack.cpp pkg/dem/DataClass/SpherePack.hpp pkg/dem/Engine/Callback/UnbalancedForceCallbacks.cpp pkg/dem/Engine/Functor/Ig2_Box_Sphere_ScGeom.cpp pkg/dem/Engine/Functor/Ig2_Facet_Sphere_ScGeom.cpp pkg/dem/Engine/Functor/Ig2_Sphere_Sphere_ScGeom.cpp pkg/dem/Engine/Functor/Ip2_2xCohFrictMat_NormalInelasticityPhys.cpp pkg/dem/Engine/GlobalEngine/CohesionlessMomentRotation.cpp pkg/dem/Engine/GlobalEngine/CohesionlessMomentRotation.hpp pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp pkg/dem/Engine/GlobalEngine/CohesiveFrictionalPM.cpp pkg/dem/Engine/GlobalEngine/CohesiveFrictionalPM.hpp pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp pkg/dem/Engine/GlobalEngine/FacetTopologyAnalyzer.cpp pkg/dem/Engine/GlobalEngine/FacetTopologyAnalyzer.hpp pkg/dem/Engine/GlobalEngine/FlatGridCollider.hpp pkg/dem/Engine/GlobalEngine/ForceRecorder.cpp pkg/dem/Engine/GlobalEngine/GlobalStiffnessTimeStepper.cpp pkg/dem/Engine/GlobalEngine/HertzMindlin.cpp pkg/dem/Engine/GlobalEngine/Law2_ScGeom_CapillaryPhys_Capillarity.cpp pkg/dem/Engine/GlobalEngine/MicroMacroAnalyser.cpp pkg/dem/Engine/GlobalEngine/NewtonIntegrator.cpp pkg/dem/Engine/GlobalEngine/NewtonIntegrator.hpp pkg/dem/Engine/GlobalEngine/NormalInelasticityLaw.cpp pkg/dem/Engine/GlobalEngine/PeriIsoCompressor.cpp pkg/dem/Engine/GlobalEngine/PeriIsoCompressor.hpp pkg/dem/Engine/GlobalEngine/TesselationWrapper.cpp pkg/dem/Engine/PartialEngine/Disp2DPropLoadEngine.cpp pkg/dem/Engine/PartialEngine/KinemCTDEngine.cpp pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp pkg/dem/PreProcessor/CohesiveTriaxialTest.hpp pkg/dem/PreProcessor/DirectShearCis.cpp pkg/dem/PreProcessor/STLImporter.cpp pkg/dem/PreProcessor/STLImporterTest.cpp pkg/dem/PreProcessor/SimpleShear.cpp pkg/dem/PreProcessor/TriaxialTest.cpp pkg/dem/PreProcessor/TriaxialTest.hpp pkg/dem/PreProcessor/TriaxialTestWater.cpp pkg/dem/PreProcessor/TriaxialTestWater.hpp pkg/dem/meta/ConcretePM.cpp pkg/dem/meta/ConcretePM.hpp pkg/dem/meta/RockPM.cpp pkg/dem/meta/RockPM.hpp pkg/dem/meta/Shop.cpp pkg/dem/meta/Shop.hpp pkg/dem/meta/Tetra.cpp pkg/dem/meta/ViscoelasticPM.cpp py/_eudoxos.cpp py/_utils.cpp py/miniWm3Wrap/manualWrap.cpp py/pack/_packObb.cpp py/yadeWrapper/yadeWrapper.cpp scripts/hackett-warn-replace.py* The size of the diff (6065 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
