yade-dev team mailing list archive

Thread
Date

[Branch ~yade-dev/yade/trunk] Rev 1997: 1. Moved all (most) unused files to attic/* (such as those that have YADE_REQUIRE_FEATURE(PHYSPAR...

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Tue, 02 Feb 2010 10:01:14 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 1997
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-02-02 10:59:57 +0100
message:
  1. Moved all (most) unused files to attic/* (such as those that have YADE_REQUIRE_FEATURE(PHYSPAR);). We will not keep them there indefinitely (they are in the history), though. If you want to re-enable some classes, fix them and move them back (using bzr mv) to pkg/*. If I inconsciously moved some file that was being used, please fix it yourself (it is unlikely, though).
added:
  attic/
  attic/README
  attic/pkg/
  attic/pkg/common/
  attic/pkg/common/DataClass/
  attic/pkg/common/DataClass/Shape/
  attic/pkg/common/Engine/
  attic/pkg/common/Engine/Dispatcher/
  attic/pkg/common/Engine/Functor/
  attic/pkg/common/Engine/GlobalEngine/
  attic/pkg/common/Engine/PartialEngine/
  attic/pkg/common/RenderingEngine/
  attic/pkg/dem/
  attic/pkg/dem/DataClass/
  attic/pkg/dem/DataClass/InteractionPhysics/
  attic/pkg/dem/DataClass/PhysicalParameters/
  attic/pkg/dem/Engine/
  attic/pkg/dem/Engine/Functor/
  attic/pkg/dem/Engine/GlobalEngine/
  attic/pkg/dem/Engine/PartialEngine/
  attic/pkg/dem/PreProcessor/
  attic/pkg/dem/RenderingEngine/
renamed:
  pkg/common/DataClass/GeometricalModel/ => attic/pkg/common/DataClass/GeometricalModel/
  pkg/common/DataClass/PhysicalParameters/ => attic/pkg/common/DataClass/PhysicalParameters/
  pkg/common/DataClass/Shape/BssSweptSphereLineSegment.cpp => attic/pkg/common/DataClass/Shape/BssSweptSphereLineSegment.cpp
  pkg/common/DataClass/Shape/BssSweptSphereLineSegment.hpp => attic/pkg/common/DataClass/Shape/BssSweptSphereLineSegment.hpp
  pkg/common/DataClass/Shape/InteractingNode.cpp => attic/pkg/common/DataClass/Shape/InteractingNode.cpp
  pkg/common/DataClass/Shape/InteractingNode.hpp => attic/pkg/common/DataClass/Shape/InteractingNode.hpp
  pkg/common/Engine/Dispatcher/GeometricalModelEngineUnit.cpp => attic/pkg/common/Engine/Dispatcher/GeometricalModelEngineUnit.cpp
  pkg/common/Engine/Dispatcher/GeometricalModelEngineUnit.hpp => attic/pkg/common/Engine/Dispatcher/GeometricalModelEngineUnit.hpp
  pkg/common/Engine/Dispatcher/GeometricalModelMetaEngine.cpp => attic/pkg/common/Engine/Dispatcher/GeometricalModelMetaEngine.cpp
  pkg/common/Engine/Dispatcher/GeometricalModelMetaEngine.hpp => attic/pkg/common/Engine/Dispatcher/GeometricalModelMetaEngine.hpp
  pkg/common/Engine/Dispatcher/InteractingGeometryEngineUnit.cpp => attic/pkg/common/Engine/Dispatcher/InteractingGeometryEngineUnit.cpp
  pkg/common/Engine/Dispatcher/InteractingGeometryEngineUnit.hpp => attic/pkg/common/Engine/Dispatcher/InteractingGeometryEngineUnit.hpp
  pkg/common/Engine/Dispatcher/InteractingGeometryMetaEngine.cpp => attic/pkg/common/Engine/Dispatcher/InteractingGeometryMetaEngine.cpp
  pkg/common/Engine/Dispatcher/InteractingGeometryMetaEngine.hpp => attic/pkg/common/Engine/Dispatcher/InteractingGeometryMetaEngine.hpp
  pkg/common/Engine/Dispatcher/PhysicalActionApplier.cpp => attic/pkg/common/Engine/Dispatcher/PhysicalActionApplier.cpp
  pkg/common/Engine/Dispatcher/PhysicalActionApplier.hpp => attic/pkg/common/Engine/Dispatcher/PhysicalActionApplier.hpp
  pkg/common/Engine/Dispatcher/PhysicalActionApplierUnit.cpp => attic/pkg/common/Engine/Dispatcher/PhysicalActionApplierUnit.cpp
  pkg/common/Engine/Dispatcher/PhysicalActionApplierUnit.hpp => attic/pkg/common/Engine/Dispatcher/PhysicalActionApplierUnit.hpp
  pkg/common/Engine/Dispatcher/PhysicalActionDamper.cpp => attic/pkg/common/Engine/Dispatcher/PhysicalActionDamper.cpp
  pkg/common/Engine/Dispatcher/PhysicalActionDamper.hpp => attic/pkg/common/Engine/Dispatcher/PhysicalActionDamper.hpp
  pkg/common/Engine/Dispatcher/PhysicalActionDamperUnit.cpp => attic/pkg/common/Engine/Dispatcher/PhysicalActionDamperUnit.cpp
  pkg/common/Engine/Dispatcher/PhysicalActionDamperUnit.hpp => attic/pkg/common/Engine/Dispatcher/PhysicalActionDamperUnit.hpp
  pkg/common/Engine/Dispatcher/StateEngineUnit.cpp => attic/pkg/common/Engine/Dispatcher/StateEngineUnit.cpp
  pkg/common/Engine/Dispatcher/StateEngineUnit.hpp => attic/pkg/common/Engine/Dispatcher/StateEngineUnit.hpp
  pkg/common/Engine/Dispatcher/StateMetaEngine.cpp => attic/pkg/common/Engine/Dispatcher/StateMetaEngine.cpp
  pkg/common/Engine/Dispatcher/StateMetaEngine.hpp => attic/pkg/common/Engine/Dispatcher/StateMetaEngine.hpp
  pkg/common/Engine/Functor/CundallNonViscousDamping.cpp => attic/pkg/common/Engine/Functor/CundallNonViscousDamping.cpp
  pkg/common/Engine/Functor/CundallNonViscousDamping.hpp => attic/pkg/common/Engine/Functor/CundallNonViscousDamping.hpp
  pkg/common/Engine/Functor/ElasticBodySimpleRelationship.cpp => attic/pkg/common/Engine/Functor/ElasticBodySimpleRelationship.cpp
  pkg/common/Engine/Functor/ElasticBodySimpleRelationship.hpp => attic/pkg/common/Engine/Functor/ElasticBodySimpleRelationship.hpp
  pkg/common/Engine/Functor/LeapFrogOrientationIntegrator.cpp => attic/pkg/common/Engine/Functor/LeapFrogOrientationIntegrator.cpp
  pkg/common/Engine/Functor/LeapFrogOrientationIntegrator.hpp => attic/pkg/common/Engine/Functor/LeapFrogOrientationIntegrator.hpp
  pkg/common/Engine/Functor/LeapFrogPositionIntegrator.cpp => attic/pkg/common/Engine/Functor/LeapFrogPositionIntegrator.cpp
  pkg/common/Engine/Functor/LeapFrogPositionIntegrator.hpp => attic/pkg/common/Engine/Functor/LeapFrogPositionIntegrator.hpp
  pkg/common/Engine/Functor/NewtonsForceLaw.cpp => attic/pkg/common/Engine/Functor/NewtonsForceLaw.cpp
  pkg/common/Engine/Functor/NewtonsForceLaw.hpp => attic/pkg/common/Engine/Functor/NewtonsForceLaw.hpp
  pkg/common/Engine/Functor/NewtonsMomentumLaw.cpp => attic/pkg/common/Engine/Functor/NewtonsMomentumLaw.cpp
  pkg/common/Engine/Functor/NewtonsMomentumLaw.hpp => attic/pkg/common/Engine/Functor/NewtonsMomentumLaw.hpp
  pkg/common/Engine/Functor/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.cpp => attic/pkg/common/Engine/Functor/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.cpp
  pkg/common/Engine/Functor/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.hpp => attic/pkg/common/Engine/Functor/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.hpp
  pkg/common/Engine/Functor/ef2_BssSweptSphereLineSegment_AABB_makeAABB.cpp => attic/pkg/common/Engine/Functor/ef2_BssSweptSphereLineSegment_AABB_makeAABB.cpp
  pkg/common/Engine/Functor/ef2_BssSweptSphereLineSegment_AABB_makeAABB.hpp => attic/pkg/common/Engine/Functor/ef2_BssSweptSphereLineSegment_AABB_makeAABB.hpp
  pkg/common/Engine/GlobalEngine/ResetPositionEngine.cpp => attic/pkg/common/Engine/GlobalEngine/ResetPositionEngine.cpp
  pkg/common/Engine/GlobalEngine/ResetPositionEngine.hpp => attic/pkg/common/Engine/GlobalEngine/ResetPositionEngine.hpp
  pkg/common/Engine/PartialEngine/DisplacementEngine.cpp => attic/pkg/common/Engine/PartialEngine/DisplacementEngine.cpp
  pkg/common/Engine/PartialEngine/DisplacementEngine.hpp => attic/pkg/common/Engine/PartialEngine/DisplacementEngine.hpp
  pkg/common/Engine/PartialEngine/DisplacementToForceEngine.cpp => attic/pkg/common/Engine/PartialEngine/DisplacementToForceEngine.cpp
  pkg/common/Engine/PartialEngine/DisplacementToForceEngine.hpp => attic/pkg/common/Engine/PartialEngine/DisplacementToForceEngine.hpp
  pkg/common/Engine/PartialEngine/Se3Interpolator.cpp => attic/pkg/common/Engine/PartialEngine/Se3Interpolator.cpp
  pkg/common/Engine/PartialEngine/Se3Interpolator.hpp => attic/pkg/common/Engine/PartialEngine/Se3Interpolator.hpp
  pkg/common/Engine/PartialEngine/StaticAttractionEngine.cpp => attic/pkg/common/Engine/PartialEngine/StaticAttractionEngine.cpp
  pkg/common/Engine/PartialEngine/StaticAttractionEngine.hpp => attic/pkg/common/Engine/PartialEngine/StaticAttractionEngine.hpp
  pkg/common/RenderingEngine/GLDrawBoxModel.cpp => attic/pkg/common/RenderingEngine/GLDrawBoxModel.cpp
  pkg/common/RenderingEngine/GLDrawBoxModel.hpp => attic/pkg/common/RenderingEngine/GLDrawBoxModel.hpp
  pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.cpp => attic/pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.cpp
  pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.hpp => attic/pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.hpp
  pkg/common/RenderingEngine/GLDrawFacetModel.cpp => attic/pkg/common/RenderingEngine/GLDrawFacetModel.cpp
  pkg/common/RenderingEngine/GLDrawFacetModel.hpp => attic/pkg/common/RenderingEngine/GLDrawFacetModel.hpp
  pkg/common/RenderingEngine/GLDrawNormalInteraction.cpp => attic/pkg/common/RenderingEngine/GLDrawNormalInteraction.cpp
  pkg/common/RenderingEngine/GLDrawNormalInteraction.hpp => attic/pkg/common/RenderingEngine/GLDrawNormalInteraction.hpp
  pkg/common/RenderingEngine/GLDrawParticleState.cpp => attic/pkg/common/RenderingEngine/GLDrawParticleState.cpp
  pkg/common/RenderingEngine/GLDrawParticleState.hpp => attic/pkg/common/RenderingEngine/GLDrawParticleState.hpp
  pkg/common/RenderingEngine/GLDrawQuadrilateral.cpp => attic/pkg/common/RenderingEngine/GLDrawQuadrilateral.cpp
  pkg/common/RenderingEngine/GLDrawQuadrilateral.hpp => attic/pkg/common/RenderingEngine/GLDrawQuadrilateral.hpp
  pkg/common/RenderingEngine/GLDrawRigidBodyState.cpp => attic/pkg/common/RenderingEngine/GLDrawRigidBodyState.cpp
  pkg/common/RenderingEngine/GLDrawRigidBodyState.hpp => attic/pkg/common/RenderingEngine/GLDrawRigidBodyState.hpp
  pkg/common/RenderingEngine/GLDrawSphereModel.cpp => attic/pkg/common/RenderingEngine/GLDrawSphereModel.cpp
  pkg/common/RenderingEngine/GLDrawSphereModel.hpp => attic/pkg/common/RenderingEngine/GLDrawSphereModel.hpp
  pkg/common/RenderingEngine/GLDrawTetrahedron.cpp => attic/pkg/common/RenderingEngine/GLDrawTetrahedron.cpp
  pkg/common/RenderingEngine/GLDrawTetrahedron.hpp => attic/pkg/common/RenderingEngine/GLDrawTetrahedron.hpp
  pkg/common/RenderingEngine/GLDrawTube.cpp => attic/pkg/common/RenderingEngine/GLDrawTube.cpp
  pkg/common/RenderingEngine/GLDrawTube.hpp => attic/pkg/common/RenderingEngine/GLDrawTube.hpp
  pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.cpp => attic/pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.cpp
  pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.hpp => attic/pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.hpp
  pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp => attic/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp
  pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp => attic/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp
  pkg/dem/DataClass/PhysicalParameters/ => pkg/dem/DataClass/Material/
  pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.cpp => attic/pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.cpp
  pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.hpp => attic/pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.hpp
  pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.cpp => attic/pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.cpp
  pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.hpp => attic/pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.hpp
  pkg/dem/Engine/Functor/BasicViscoelasticRelationships.cpp => attic/pkg/dem/Engine/Functor/BasicViscoelasticRelationships.cpp
  pkg/dem/Engine/Functor/BasicViscoelasticRelationships.hpp => attic/pkg/dem/Engine/Functor/BasicViscoelasticRelationships.hpp
  pkg/dem/Engine/Functor/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.cpp => attic/pkg/dem/Engine/Functor/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.cpp
  pkg/dem/Engine/Functor/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.hpp => attic/pkg/dem/Engine/Functor/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.hpp
  pkg/dem/Engine/Functor/MacroMicroElasticRelationships.cpp => attic/pkg/dem/Engine/Functor/MacroMicroElasticRelationships.cpp
  pkg/dem/Engine/Functor/MacroMicroElasticRelationships.hpp => attic/pkg/dem/Engine/Functor/MacroMicroElasticRelationships.hpp
  pkg/dem/Engine/Functor/SimpleViscoelasticRelationships.cpp => attic/pkg/dem/Engine/Functor/SimpleViscoelasticRelationships.cpp
  pkg/dem/Engine/Functor/SimpleViscoelasticRelationships.hpp => attic/pkg/dem/Engine/Functor/SimpleViscoelasticRelationships.hpp
  pkg/dem/Engine/GlobalEngine/AveragePositionRecorder.cpp => attic/pkg/dem/Engine/GlobalEngine/AveragePositionRecorder.cpp
  pkg/dem/Engine/GlobalEngine/AveragePositionRecorder.hpp => attic/pkg/dem/Engine/GlobalEngine/AveragePositionRecorder.hpp
  pkg/dem/Engine/GlobalEngine/ElasticCohesiveLaw.cpp => attic/pkg/dem/Engine/GlobalEngine/ElasticCohesiveLaw.cpp
  pkg/dem/Engine/GlobalEngine/ElasticCohesiveLaw.hpp => attic/pkg/dem/Engine/GlobalEngine/ElasticCohesiveLaw.hpp
  pkg/dem/Engine/GlobalEngine/ElasticCriterionTimeStepper.cpp => attic/pkg/dem/Engine/GlobalEngine/ElasticCriterionTimeStepper.cpp
  pkg/dem/Engine/GlobalEngine/ElasticCriterionTimeStepper.hpp => attic/pkg/dem/Engine/GlobalEngine/ElasticCriterionTimeStepper.hpp
  pkg/dem/Engine/GlobalEngine/ForceRecorder.cpp => attic/pkg/dem/Engine/GlobalEngine/ForceRecorder.cpp
  pkg/dem/Engine/GlobalEngine/ForceRecorder.hpp => attic/pkg/dem/Engine/GlobalEngine/ForceRecorder.hpp
  pkg/dem/Engine/GlobalEngine/ForceSnapshot.cpp => attic/pkg/dem/Engine/GlobalEngine/ForceSnapshot.cpp
  pkg/dem/Engine/GlobalEngine/ForceSnapshot.hpp => attic/pkg/dem/Engine/GlobalEngine/ForceSnapshot.hpp
  pkg/dem/Engine/GlobalEngine/GeometricalModelForceColorizer.cpp => attic/pkg/dem/Engine/GlobalEngine/GeometricalModelForceColorizer.cpp
  pkg/dem/Engine/GlobalEngine/GeometricalModelForceColorizer.hpp => attic/pkg/dem/Engine/GlobalEngine/GeometricalModelForceColorizer.hpp
  pkg/dem/Engine/GlobalEngine/HistoryRecorder.cpp => attic/pkg/dem/Engine/GlobalEngine/HistoryRecorder.cpp
  pkg/dem/Engine/GlobalEngine/HistoryRecorder.hpp => attic/pkg/dem/Engine/GlobalEngine/HistoryRecorder.hpp
  pkg/dem/Engine/GlobalEngine/MGPRecorder.cpp => attic/pkg/dem/Engine/GlobalEngine/MGPRecorder.cpp
  pkg/dem/Engine/GlobalEngine/MGPRecorder.hpp => attic/pkg/dem/Engine/GlobalEngine/MGPRecorder.hpp
  pkg/dem/Engine/GlobalEngine/PositionRecorder.cpp => attic/pkg/dem/Engine/GlobalEngine/PositionRecorder.cpp
  pkg/dem/Engine/GlobalEngine/PositionRecorder.hpp => attic/pkg/dem/Engine/GlobalEngine/PositionRecorder.hpp
  pkg/dem/Engine/GlobalEngine/PositionSnapshot.cpp => attic/pkg/dem/Engine/GlobalEngine/PositionSnapshot.cpp
  pkg/dem/Engine/GlobalEngine/PositionSnapshot.hpp => attic/pkg/dem/Engine/GlobalEngine/PositionSnapshot.hpp
  pkg/dem/Engine/GlobalEngine/RigidBodyRecorder.cpp => attic/pkg/dem/Engine/GlobalEngine/RigidBodyRecorder.cpp
  pkg/dem/Engine/GlobalEngine/RigidBodyRecorder.hpp => attic/pkg/dem/Engine/GlobalEngine/RigidBodyRecorder.hpp
  pkg/dem/Engine/GlobalEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp => attic/pkg/dem/Engine/GlobalEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp
  pkg/dem/Engine/GlobalEngine/SimpleViscoelasticSpheresInteractionRecorder.hpp => attic/pkg/dem/Engine/GlobalEngine/SimpleViscoelasticSpheresInteractionRecorder.hpp
  pkg/dem/Engine/GlobalEngine/VelocityRecorder.cpp => attic/pkg/dem/Engine/GlobalEngine/VelocityRecorder.cpp
  pkg/dem/Engine/GlobalEngine/VelocityRecorder.hpp => attic/pkg/dem/Engine/GlobalEngine/VelocityRecorder.hpp
  pkg/dem/Engine/GlobalEngine/ViscousForceDamping.cpp => attic/pkg/dem/Engine/GlobalEngine/ViscousForceDamping.cpp
  pkg/dem/Engine/GlobalEngine/ViscousForceDamping.hpp => attic/pkg/dem/Engine/GlobalEngine/ViscousForceDamping.hpp
  pkg/dem/Engine/GlobalEngine/VolumicContactLaw.cpp => attic/pkg/dem/Engine/GlobalEngine/VolumicContactLaw.cpp
  pkg/dem/Engine/GlobalEngine/VolumicContactLaw.hpp => attic/pkg/dem/Engine/GlobalEngine/VolumicContactLaw.hpp
  pkg/dem/Engine/PartialEngine/StaticSpheresAttractionEngine.cpp => attic/pkg/dem/Engine/PartialEngine/StaticSpheresAttractionEngine.cpp
  pkg/dem/Engine/PartialEngine/StaticSpheresAttractionEngine.hpp => attic/pkg/dem/Engine/PartialEngine/StaticSpheresAttractionEngine.hpp
  pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.cpp => attic/pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.cpp
  pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.hpp => attic/pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.hpp
  pkg/dem/Engine/PartialEngine/WallStressRecorder.cpp => attic/pkg/dem/Engine/PartialEngine/WallStressRecorder.cpp
  pkg/dem/Engine/PartialEngine/WallStressRecorder.hpp => attic/pkg/dem/Engine/PartialEngine/WallStressRecorder.hpp
  pkg/dem/PreProcessor/ClumpTestGen.cpp => attic/pkg/dem/PreProcessor/ClumpTestGen.cpp
  pkg/dem/PreProcessor/ClumpTestGen.hpp => attic/pkg/dem/PreProcessor/ClumpTestGen.hpp
  pkg/dem/PreProcessor/Funnel.cpp => attic/pkg/dem/PreProcessor/Funnel.cpp
  pkg/dem/PreProcessor/Funnel.hpp => attic/pkg/dem/PreProcessor/Funnel.hpp
  pkg/dem/PreProcessor/MembraneTest.cpp => attic/pkg/dem/PreProcessor/MembraneTest.cpp
  pkg/dem/PreProcessor/MembraneTest.hpp => attic/pkg/dem/PreProcessor/MembraneTest.hpp
  pkg/dem/PreProcessor/SDECImpactTest.cpp => attic/pkg/dem/PreProcessor/SDECImpactTest.cpp
  pkg/dem/PreProcessor/SDECImpactTest.hpp => attic/pkg/dem/PreProcessor/SDECImpactTest.hpp
  pkg/dem/PreProcessor/SDECLinkedSpheres.cpp => attic/pkg/dem/PreProcessor/SDECLinkedSpheres.cpp
  pkg/dem/PreProcessor/SDECLinkedSpheres.hpp => attic/pkg/dem/PreProcessor/SDECLinkedSpheres.hpp
  pkg/dem/PreProcessor/SDECMovingWall.cpp => attic/pkg/dem/PreProcessor/SDECMovingWall.cpp
  pkg/dem/PreProcessor/SDECMovingWall.hpp => attic/pkg/dem/PreProcessor/SDECMovingWall.hpp
  pkg/dem/PreProcessor/SDECSpheresPlane.cpp => attic/pkg/dem/PreProcessor/SDECSpheresPlane.cpp
  pkg/dem/PreProcessor/SDECSpheresPlane.hpp => attic/pkg/dem/PreProcessor/SDECSpheresPlane.hpp
  pkg/dem/PreProcessor/SimpleScene.cpp => attic/pkg/dem/PreProcessor/SimpleScene.cpp
  pkg/dem/PreProcessor/SimpleScene.hpp => attic/pkg/dem/PreProcessor/SimpleScene.hpp
  pkg/dem/PreProcessor/SimpleShear.cpp => attic/pkg/dem/PreProcessor/SimpleShear.cpp
  pkg/dem/PreProcessor/SimpleShear.hpp => attic/pkg/dem/PreProcessor/SimpleShear.hpp
  pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp => attic/pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp
  pkg/dem/PreProcessor/TestSimpleViscoelastic.hpp => attic/pkg/dem/PreProcessor/TestSimpleViscoelastic.hpp
  pkg/dem/PreProcessor/TetraTestGen.cpp => attic/pkg/dem/PreProcessor/TetraTestGen.cpp
  pkg/dem/PreProcessor/TetraTestGen.hpp => attic/pkg/dem/PreProcessor/TetraTestGen.hpp
  pkg/dem/PreProcessor/ThreePointBending.cpp => attic/pkg/dem/PreProcessor/ThreePointBending.cpp
  pkg/dem/PreProcessor/ThreePointBending.hpp => attic/pkg/dem/PreProcessor/ThreePointBending.hpp
  pkg/dem/PreProcessor/UniaxialStrainerGen.cpp => attic/pkg/dem/PreProcessor/UniaxialStrainerGen.cpp
  pkg/dem/PreProcessor/UniaxialStrainerGen.hpp => attic/pkg/dem/PreProcessor/UniaxialStrainerGen.hpp
  pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp => attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp
  pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp => attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp
  pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.cpp => attic/pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.cpp
  pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.hpp => attic/pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.hpp
  pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.cpp => attic/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.cpp
  pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.hpp => attic/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.hpp
  pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.cpp => attic/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.cpp
  pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.hpp => attic/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.hpp
  pkg/lattice/ => attic/pkg/lattice/
  pkg/snow/ => attic/pkg/snow/
modified:
  SConstruct
  core/Body.hpp
  pkg/common/Engine/GlobalEngine/SpheresFactory.cpp
  pkg/dem/Engine/GlobalEngine/CohesionlessMomentRotation.cpp*
  pkg/dem/Engine/GlobalEngine/CohesionlessMomentRotation.hpp*
  pkg/dem/Engine/GlobalEngine/CundallStrack.cpp*
  pkg/dem/Engine/GlobalEngine/CundallStrack.hpp*
  pkg/dem/Engine/GlobalEngine/GlobalStiffnessTimeStepper.cpp
  pkg/dem/Engine/GlobalEngine/TesselationWrapper.cpp*
  pkg/dem/Engine/GlobalEngine/TesselationWrapper.hpp*
  pkg/dem/Engine/PartialEngine/FlowEngine.cpp*
  pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp
  pkg/dem/Engine/PartialEngine/TriaxialStressController.cpp
  pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp
  pkg/dem/PreProcessor/STLImporter.cpp
  pkg/dem/PreProcessor/STLImporter.hpp
  pkg/dem/PreProcessor/STLImporterTest.cpp
  pkg/dem/PreProcessor/TriaxialTest.cpp
  pkg/dem/PreProcessor/TriaxialTestWater.cpp
  pkg/dem/meta/Shop.cpp
  py/_utils.cpp
  py/yadeWrapper/customConverters.cpp
  py/yadeWrapper/yadeWrapper.cpp


--
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.

=== modified file 'SConstruct'
--- SConstruct	2010-01-23 10:53:12 +0000
+++ SConstruct	2010-02-02 09:59:57 +0000
@@ -225,7 +225,7 @@
 		else: print "Nothing to clean: %s."%buildDir
 		sys.argv.remove('clean')
 	if 'tags' in sys.argv:
-		cmd="ctags -R --extra=+q --fields=+n --exclude='.*' --exclude=doc --exclude=scons-local --exclude=include --exclude=debian --exclude='*.so' --langmap=c++:+.inl,c++:+.tpp,c++:+.ipp"
+		cmd="ctags -R --extra=+q --fields=+n --exclude='.*' --exclude=attic --exclude=doc --exclude=scons-local --exclude=include --exclude=debian --exclude='*.so' --langmap=c++:+.inl,c++:+.tpp,c++:+.ipp"
 		print cmd; os.system(cmd)
 		sys.argv.remove('tags')
 	if 'doc' in sys.argv:

=== added directory 'attic'
=== added file 'attic/README'
--- attic/README	1970-01-01 00:00:00 +0000
+++ attic/README	2010-02-02 09:59:57 +0000
@@ -0,0 +1,3 @@
+This directory serves for files that are no longer part of yade, but we just don't want to delete those for some reason. Maybe they are waiting for being fixed by their author.
+
+Keep the same directory structure as in top-level directory here.

=== added directory 'attic/pkg'
=== added directory 'attic/pkg/common'
=== added directory 'attic/pkg/common/DataClass'
=== renamed directory 'pkg/common/DataClass/GeometricalModel' => 'attic/pkg/common/DataClass/GeometricalModel'
=== renamed directory 'pkg/common/DataClass/PhysicalParameters' => 'attic/pkg/common/DataClass/PhysicalParameters'
=== added directory 'attic/pkg/common/DataClass/Shape'
=== renamed file 'pkg/common/DataClass/Shape/BssSweptSphereLineSegment.cpp' => 'attic/pkg/common/DataClass/Shape/BssSweptSphereLineSegment.cpp'
=== renamed file 'pkg/common/DataClass/Shape/BssSweptSphereLineSegment.hpp' => 'attic/pkg/common/DataClass/Shape/BssSweptSphereLineSegment.hpp'
=== renamed file 'pkg/common/DataClass/Shape/InteractingNode.cpp' => 'attic/pkg/common/DataClass/Shape/InteractingNode.cpp'
=== renamed file 'pkg/common/DataClass/Shape/InteractingNode.hpp' => 'attic/pkg/common/DataClass/Shape/InteractingNode.hpp'
=== added directory 'attic/pkg/common/Engine'
=== added directory 'attic/pkg/common/Engine/Dispatcher'
=== renamed file 'pkg/common/Engine/Dispatcher/GeometricalModelEngineUnit.cpp' => 'attic/pkg/common/Engine/Dispatcher/GeometricalModelEngineUnit.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/GeometricalModelEngineUnit.hpp' => 'attic/pkg/common/Engine/Dispatcher/GeometricalModelEngineUnit.hpp'
=== renamed file 'pkg/common/Engine/Dispatcher/GeometricalModelMetaEngine.cpp' => 'attic/pkg/common/Engine/Dispatcher/GeometricalModelMetaEngine.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/GeometricalModelMetaEngine.hpp' => 'attic/pkg/common/Engine/Dispatcher/GeometricalModelMetaEngine.hpp'
=== renamed file 'pkg/common/Engine/Dispatcher/InteractingGeometryEngineUnit.cpp' => 'attic/pkg/common/Engine/Dispatcher/InteractingGeometryEngineUnit.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/InteractingGeometryEngineUnit.hpp' => 'attic/pkg/common/Engine/Dispatcher/InteractingGeometryEngineUnit.hpp'
=== renamed file 'pkg/common/Engine/Dispatcher/InteractingGeometryMetaEngine.cpp' => 'attic/pkg/common/Engine/Dispatcher/InteractingGeometryMetaEngine.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/InteractingGeometryMetaEngine.hpp' => 'attic/pkg/common/Engine/Dispatcher/InteractingGeometryMetaEngine.hpp'
=== renamed file 'pkg/common/Engine/Dispatcher/PhysicalActionApplier.cpp' => 'attic/pkg/common/Engine/Dispatcher/PhysicalActionApplier.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/PhysicalActionApplier.hpp' => 'attic/pkg/common/Engine/Dispatcher/PhysicalActionApplier.hpp'
=== renamed file 'pkg/common/Engine/Dispatcher/PhysicalActionApplierUnit.cpp' => 'attic/pkg/common/Engine/Dispatcher/PhysicalActionApplierUnit.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/PhysicalActionApplierUnit.hpp' => 'attic/pkg/common/Engine/Dispatcher/PhysicalActionApplierUnit.hpp'
=== renamed file 'pkg/common/Engine/Dispatcher/PhysicalActionDamper.cpp' => 'attic/pkg/common/Engine/Dispatcher/PhysicalActionDamper.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/PhysicalActionDamper.hpp' => 'attic/pkg/common/Engine/Dispatcher/PhysicalActionDamper.hpp'
=== renamed file 'pkg/common/Engine/Dispatcher/PhysicalActionDamperUnit.cpp' => 'attic/pkg/common/Engine/Dispatcher/PhysicalActionDamperUnit.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/PhysicalActionDamperUnit.hpp' => 'attic/pkg/common/Engine/Dispatcher/PhysicalActionDamperUnit.hpp'
=== renamed file 'pkg/common/Engine/Dispatcher/StateEngineUnit.cpp' => 'attic/pkg/common/Engine/Dispatcher/StateEngineUnit.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/StateEngineUnit.hpp' => 'attic/pkg/common/Engine/Dispatcher/StateEngineUnit.hpp'
=== renamed file 'pkg/common/Engine/Dispatcher/StateMetaEngine.cpp' => 'attic/pkg/common/Engine/Dispatcher/StateMetaEngine.cpp'
=== renamed file 'pkg/common/Engine/Dispatcher/StateMetaEngine.hpp' => 'attic/pkg/common/Engine/Dispatcher/StateMetaEngine.hpp'
=== added directory 'attic/pkg/common/Engine/Functor'
=== renamed file 'pkg/common/Engine/Functor/CundallNonViscousDamping.cpp' => 'attic/pkg/common/Engine/Functor/CundallNonViscousDamping.cpp'
=== renamed file 'pkg/common/Engine/Functor/CundallNonViscousDamping.hpp' => 'attic/pkg/common/Engine/Functor/CundallNonViscousDamping.hpp'
=== renamed file 'pkg/common/Engine/Functor/ElasticBodySimpleRelationship.cpp' => 'attic/pkg/common/Engine/Functor/ElasticBodySimpleRelationship.cpp'
=== renamed file 'pkg/common/Engine/Functor/ElasticBodySimpleRelationship.hpp' => 'attic/pkg/common/Engine/Functor/ElasticBodySimpleRelationship.hpp'
=== renamed file 'pkg/common/Engine/Functor/LeapFrogOrientationIntegrator.cpp' => 'attic/pkg/common/Engine/Functor/LeapFrogOrientationIntegrator.cpp'
=== renamed file 'pkg/common/Engine/Functor/LeapFrogOrientationIntegrator.hpp' => 'attic/pkg/common/Engine/Functor/LeapFrogOrientationIntegrator.hpp'
=== renamed file 'pkg/common/Engine/Functor/LeapFrogPositionIntegrator.cpp' => 'attic/pkg/common/Engine/Functor/LeapFrogPositionIntegrator.cpp'
=== renamed file 'pkg/common/Engine/Functor/LeapFrogPositionIntegrator.hpp' => 'attic/pkg/common/Engine/Functor/LeapFrogPositionIntegrator.hpp'
=== renamed file 'pkg/common/Engine/Functor/NewtonsForceLaw.cpp' => 'attic/pkg/common/Engine/Functor/NewtonsForceLaw.cpp'
=== renamed file 'pkg/common/Engine/Functor/NewtonsForceLaw.hpp' => 'attic/pkg/common/Engine/Functor/NewtonsForceLaw.hpp'
=== renamed file 'pkg/common/Engine/Functor/NewtonsMomentumLaw.cpp' => 'attic/pkg/common/Engine/Functor/NewtonsMomentumLaw.cpp'
=== renamed file 'pkg/common/Engine/Functor/NewtonsMomentumLaw.hpp' => 'attic/pkg/common/Engine/Functor/NewtonsMomentumLaw.hpp'
=== renamed file 'pkg/common/Engine/Functor/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.cpp' => 'attic/pkg/common/Engine/Functor/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.cpp'
=== renamed file 'pkg/common/Engine/Functor/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.hpp' => 'attic/pkg/common/Engine/Functor/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.hpp'
=== renamed file 'pkg/common/Engine/Functor/ef2_BssSweptSphereLineSegment_AABB_makeAABB.cpp' => 'attic/pkg/common/Engine/Functor/ef2_BssSweptSphereLineSegment_AABB_makeAABB.cpp'
=== renamed file 'pkg/common/Engine/Functor/ef2_BssSweptSphereLineSegment_AABB_makeAABB.hpp' => 'attic/pkg/common/Engine/Functor/ef2_BssSweptSphereLineSegment_AABB_makeAABB.hpp'
=== added directory 'attic/pkg/common/Engine/GlobalEngine'
=== renamed file 'pkg/common/Engine/GlobalEngine/ResetPositionEngine.cpp' => 'attic/pkg/common/Engine/GlobalEngine/ResetPositionEngine.cpp'
=== renamed file 'pkg/common/Engine/GlobalEngine/ResetPositionEngine.hpp' => 'attic/pkg/common/Engine/GlobalEngine/ResetPositionEngine.hpp'
=== added directory 'attic/pkg/common/Engine/PartialEngine'
=== renamed file 'pkg/common/Engine/PartialEngine/DisplacementEngine.cpp' => 'attic/pkg/common/Engine/PartialEngine/DisplacementEngine.cpp'
=== renamed file 'pkg/common/Engine/PartialEngine/DisplacementEngine.hpp' => 'attic/pkg/common/Engine/PartialEngine/DisplacementEngine.hpp'
=== renamed file 'pkg/common/Engine/PartialEngine/DisplacementToForceEngine.cpp' => 'attic/pkg/common/Engine/PartialEngine/DisplacementToForceEngine.cpp'
=== renamed file 'pkg/common/Engine/PartialEngine/DisplacementToForceEngine.hpp' => 'attic/pkg/common/Engine/PartialEngine/DisplacementToForceEngine.hpp'
=== renamed file 'pkg/common/Engine/PartialEngine/Se3Interpolator.cpp' => 'attic/pkg/common/Engine/PartialEngine/Se3Interpolator.cpp'
=== renamed file 'pkg/common/Engine/PartialEngine/Se3Interpolator.hpp' => 'attic/pkg/common/Engine/PartialEngine/Se3Interpolator.hpp'
=== renamed file 'pkg/common/Engine/PartialEngine/StaticAttractionEngine.cpp' => 'attic/pkg/common/Engine/PartialEngine/StaticAttractionEngine.cpp'
=== renamed file 'pkg/common/Engine/PartialEngine/StaticAttractionEngine.hpp' => 'attic/pkg/common/Engine/PartialEngine/StaticAttractionEngine.hpp'
=== added directory 'attic/pkg/common/RenderingEngine'
=== renamed file 'pkg/common/RenderingEngine/GLDrawBoxModel.cpp' => 'attic/pkg/common/RenderingEngine/GLDrawBoxModel.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawBoxModel.hpp' => 'attic/pkg/common/RenderingEngine/GLDrawBoxModel.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.cpp' => 'attic/pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.hpp' => 'attic/pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawFacetModel.cpp' => 'attic/pkg/common/RenderingEngine/GLDrawFacetModel.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawFacetModel.hpp' => 'attic/pkg/common/RenderingEngine/GLDrawFacetModel.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawNormalInteraction.cpp' => 'attic/pkg/common/RenderingEngine/GLDrawNormalInteraction.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawNormalInteraction.hpp' => 'attic/pkg/common/RenderingEngine/GLDrawNormalInteraction.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawParticleState.cpp' => 'attic/pkg/common/RenderingEngine/GLDrawParticleState.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawParticleState.hpp' => 'attic/pkg/common/RenderingEngine/GLDrawParticleState.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawQuadrilateral.cpp' => 'attic/pkg/common/RenderingEngine/GLDrawQuadrilateral.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawQuadrilateral.hpp' => 'attic/pkg/common/RenderingEngine/GLDrawQuadrilateral.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawRigidBodyState.cpp' => 'attic/pkg/common/RenderingEngine/GLDrawRigidBodyState.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawRigidBodyState.hpp' => 'attic/pkg/common/RenderingEngine/GLDrawRigidBodyState.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawSphereModel.cpp' => 'attic/pkg/common/RenderingEngine/GLDrawSphereModel.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawSphereModel.hpp' => 'attic/pkg/common/RenderingEngine/GLDrawSphereModel.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawTetrahedron.cpp' => 'attic/pkg/common/RenderingEngine/GLDrawTetrahedron.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawTetrahedron.hpp' => 'attic/pkg/common/RenderingEngine/GLDrawTetrahedron.hpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawTube.cpp' => 'attic/pkg/common/RenderingEngine/GLDrawTube.cpp'
=== renamed file 'pkg/common/RenderingEngine/GLDrawTube.hpp' => 'attic/pkg/common/RenderingEngine/GLDrawTube.hpp'
=== added directory 'attic/pkg/dem'
=== added directory 'attic/pkg/dem/DataClass'
=== added directory 'attic/pkg/dem/DataClass/InteractionPhysics'
=== renamed file 'pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.cpp' => 'attic/pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.cpp'
=== renamed file 'pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.hpp' => 'attic/pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.hpp'
=== renamed file 'pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp' => 'attic/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp'
=== renamed file 'pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp' => 'attic/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp'
=== added directory 'attic/pkg/dem/DataClass/PhysicalParameters'
=== renamed file 'pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.cpp' => 'attic/pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.cpp'
=== renamed file 'pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.hpp' => 'attic/pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.hpp'
=== renamed file 'pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.cpp' => 'attic/pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.cpp'
=== renamed file 'pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.hpp' => 'attic/pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.hpp'
=== added directory 'attic/pkg/dem/Engine'
=== added directory 'attic/pkg/dem/Engine/Functor'
=== renamed file 'pkg/dem/Engine/Functor/BasicViscoelasticRelationships.cpp' => 'attic/pkg/dem/Engine/Functor/BasicViscoelasticRelationships.cpp'
=== renamed file 'pkg/dem/Engine/Functor/BasicViscoelasticRelationships.hpp' => 'attic/pkg/dem/Engine/Functor/BasicViscoelasticRelationships.hpp'
=== renamed file 'pkg/dem/Engine/Functor/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.cpp' => 'attic/pkg/dem/Engine/Functor/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.cpp'
=== renamed file 'pkg/dem/Engine/Functor/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.hpp' => 'attic/pkg/dem/Engine/Functor/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.hpp'
=== renamed file 'pkg/dem/Engine/Functor/MacroMicroElasticRelationships.cpp' => 'attic/pkg/dem/Engine/Functor/MacroMicroElasticRelationships.cpp'
=== renamed file 'pkg/dem/Engine/Functor/MacroMicroElasticRelationships.hpp' => 'attic/pkg/dem/Engine/Functor/MacroMicroElasticRelationships.hpp'
=== renamed file 'pkg/dem/Engine/Functor/SimpleViscoelasticRelationships.cpp' => 'attic/pkg/dem/Engine/Functor/SimpleViscoelasticRelationships.cpp'
=== renamed file 'pkg/dem/Engine/Functor/SimpleViscoelasticRelationships.hpp' => 'attic/pkg/dem/Engine/Functor/SimpleViscoelasticRelationships.hpp'
=== added directory 'attic/pkg/dem/Engine/GlobalEngine'
=== renamed file 'pkg/dem/Engine/GlobalEngine/AveragePositionRecorder.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/AveragePositionRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/AveragePositionRecorder.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/AveragePositionRecorder.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ElasticCohesiveLaw.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/ElasticCohesiveLaw.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ElasticCohesiveLaw.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/ElasticCohesiveLaw.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ElasticCriterionTimeStepper.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/ElasticCriterionTimeStepper.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ElasticCriterionTimeStepper.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/ElasticCriterionTimeStepper.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ForceRecorder.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/ForceRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ForceRecorder.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/ForceRecorder.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ForceSnapshot.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/ForceSnapshot.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ForceSnapshot.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/ForceSnapshot.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/GeometricalModelForceColorizer.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/GeometricalModelForceColorizer.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/GeometricalModelForceColorizer.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/GeometricalModelForceColorizer.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/HistoryRecorder.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/HistoryRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/HistoryRecorder.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/HistoryRecorder.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/MGPRecorder.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/MGPRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/MGPRecorder.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/MGPRecorder.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/PositionRecorder.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/PositionRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/PositionRecorder.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/PositionRecorder.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/PositionSnapshot.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/PositionSnapshot.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/PositionSnapshot.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/PositionSnapshot.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/RigidBodyRecorder.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/RigidBodyRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/RigidBodyRecorder.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/RigidBodyRecorder.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/SimpleViscoelasticSpheresInteractionRecorder.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/SimpleViscoelasticSpheresInteractionRecorder.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/VelocityRecorder.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/VelocityRecorder.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/VelocityRecorder.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/VelocityRecorder.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ViscousForceDamping.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/ViscousForceDamping.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/ViscousForceDamping.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/ViscousForceDamping.hpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/VolumicContactLaw.cpp' => 'attic/pkg/dem/Engine/GlobalEngine/VolumicContactLaw.cpp'
=== renamed file 'pkg/dem/Engine/GlobalEngine/VolumicContactLaw.hpp' => 'attic/pkg/dem/Engine/GlobalEngine/VolumicContactLaw.hpp'
=== added directory 'attic/pkg/dem/Engine/PartialEngine'
=== renamed file 'pkg/dem/Engine/PartialEngine/StaticSpheresAttractionEngine.cpp' => 'attic/pkg/dem/Engine/PartialEngine/StaticSpheresAttractionEngine.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/StaticSpheresAttractionEngine.hpp' => 'attic/pkg/dem/Engine/PartialEngine/StaticSpheresAttractionEngine.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.cpp' => 'attic/pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.hpp' => 'attic/pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.hpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/WallStressRecorder.cpp' => 'attic/pkg/dem/Engine/PartialEngine/WallStressRecorder.cpp'
=== renamed file 'pkg/dem/Engine/PartialEngine/WallStressRecorder.hpp' => 'attic/pkg/dem/Engine/PartialEngine/WallStressRecorder.hpp'
=== added directory 'attic/pkg/dem/PreProcessor'
=== renamed file 'pkg/dem/PreProcessor/ClumpTestGen.cpp' => 'attic/pkg/dem/PreProcessor/ClumpTestGen.cpp'
=== renamed file 'pkg/dem/PreProcessor/ClumpTestGen.hpp' => 'attic/pkg/dem/PreProcessor/ClumpTestGen.hpp'
=== renamed file 'pkg/dem/PreProcessor/Funnel.cpp' => 'attic/pkg/dem/PreProcessor/Funnel.cpp'
=== renamed file 'pkg/dem/PreProcessor/Funnel.hpp' => 'attic/pkg/dem/PreProcessor/Funnel.hpp'
=== renamed file 'pkg/dem/PreProcessor/MembraneTest.cpp' => 'attic/pkg/dem/PreProcessor/MembraneTest.cpp'
=== renamed file 'pkg/dem/PreProcessor/MembraneTest.hpp' => 'attic/pkg/dem/PreProcessor/MembraneTest.hpp'
=== renamed file 'pkg/dem/PreProcessor/SDECImpactTest.cpp' => 'attic/pkg/dem/PreProcessor/SDECImpactTest.cpp'
=== renamed file 'pkg/dem/PreProcessor/SDECImpactTest.hpp' => 'attic/pkg/dem/PreProcessor/SDECImpactTest.hpp'
=== renamed file 'pkg/dem/PreProcessor/SDECLinkedSpheres.cpp' => 'attic/pkg/dem/PreProcessor/SDECLinkedSpheres.cpp'
=== renamed file 'pkg/dem/PreProcessor/SDECLinkedSpheres.hpp' => 'attic/pkg/dem/PreProcessor/SDECLinkedSpheres.hpp'
=== renamed file 'pkg/dem/PreProcessor/SDECMovingWall.cpp' => 'attic/pkg/dem/PreProcessor/SDECMovingWall.cpp'
=== renamed file 'pkg/dem/PreProcessor/SDECMovingWall.hpp' => 'attic/pkg/dem/PreProcessor/SDECMovingWall.hpp'
=== renamed file 'pkg/dem/PreProcessor/SDECSpheresPlane.cpp' => 'attic/pkg/dem/PreProcessor/SDECSpheresPlane.cpp'
=== renamed file 'pkg/dem/PreProcessor/SDECSpheresPlane.hpp' => 'attic/pkg/dem/PreProcessor/SDECSpheresPlane.hpp'
=== renamed file 'pkg/dem/PreProcessor/SimpleScene.cpp' => 'attic/pkg/dem/PreProcessor/SimpleScene.cpp'
=== renamed file 'pkg/dem/PreProcessor/SimpleScene.hpp' => 'attic/pkg/dem/PreProcessor/SimpleScene.hpp'
=== renamed file 'pkg/dem/PreProcessor/SimpleShear.cpp' => 'attic/pkg/dem/PreProcessor/SimpleShear.cpp'
=== renamed file 'pkg/dem/PreProcessor/SimpleShear.hpp' => 'attic/pkg/dem/PreProcessor/SimpleShear.hpp'
=== renamed file 'pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp' => 'attic/pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp'
=== renamed file 'pkg/dem/PreProcessor/TestSimpleViscoelastic.hpp' => 'attic/pkg/dem/PreProcessor/TestSimpleViscoelastic.hpp'
=== renamed file 'pkg/dem/PreProcessor/TetraTestGen.cpp' => 'attic/pkg/dem/PreProcessor/TetraTestGen.cpp'
=== renamed file 'pkg/dem/PreProcessor/TetraTestGen.hpp' => 'attic/pkg/dem/PreProcessor/TetraTestGen.hpp'
=== renamed file 'pkg/dem/PreProcessor/ThreePointBending.cpp' => 'attic/pkg/dem/PreProcessor/ThreePointBending.cpp'
=== renamed file 'pkg/dem/PreProcessor/ThreePointBending.hpp' => 'attic/pkg/dem/PreProcessor/ThreePointBending.hpp'
=== renamed file 'pkg/dem/PreProcessor/UniaxialStrainerGen.cpp' => 'attic/pkg/dem/PreProcessor/UniaxialStrainerGen.cpp'
=== renamed file 'pkg/dem/PreProcessor/UniaxialStrainerGen.hpp' => 'attic/pkg/dem/PreProcessor/UniaxialStrainerGen.hpp'
=== added directory 'attic/pkg/dem/RenderingEngine'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp' => 'attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp' => 'attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.cpp' => 'attic/pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.cpp'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.hpp' => 'attic/pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.hpp'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.cpp' => 'attic/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.cpp'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.hpp' => 'attic/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.hpp'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.cpp' => 'attic/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.cpp'
=== renamed file 'pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.hpp' => 'attic/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.hpp'
=== renamed directory 'pkg/lattice' => 'attic/pkg/lattice'
=== renamed directory 'pkg/snow' => 'attic/pkg/snow'
=== modified file 'core/Body.hpp'
--- core/Body.hpp	2010-01-22 21:07:37 +0000
+++ core/Body.hpp	2010-02-02 09:59:57 +0000
@@ -13,9 +13,6 @@
 #include"GeometricalModel.hpp"
 #include"Shape.hpp"
 #include"Bound.hpp"
-#ifdef YADE_PHYSPAR
-	#include"PhysicalParameters.hpp"
-#endif
 #include"State.hpp"
 #include"Material.hpp"
 
@@ -73,19 +70,10 @@
 		// only BodyContainer can set the id of a body
 		friend class BodyContainer;
 
-		#ifdef YADE_PHYSPAR
-			/// here are stored physical things that describe the Body: mass, stiffness
-			shared_ptr<PhysicalParameters>	physicalParameters;
-		#else
-			//! material of the body; might be shared among bodies (via shared_ptr)
-			shared_ptr<Material> material;
-			//! state of the body
-			shared_ptr<State> state;
-		#endif
-		#ifdef YADE_GEOMETRICALMODEL
-			/// the 'perfect' representation of body's geometry: Polyhedron, BoxModel
-			shared_ptr<GeometricalModel>	geometricalModel;
-		#endif
+		//! material of the body; might be shared among bodies (via shared_ptr)
+		shared_ptr<Material> material;
+		//! state of the body
+		shared_ptr<State> state;
 		/// description of how this body interacts with others, like: SphereHierarchy, Box
 		shared_ptr<Shape> shape;
 		/// Bound is used for quick detection of potential interactions, that can be: Aabb, K-Dop

=== modified file 'pkg/common/Engine/GlobalEngine/SpheresFactory.cpp'
--- pkg/common/Engine/GlobalEngine/SpheresFactory.cpp	2010-01-03 20:30:24 +0000
+++ pkg/common/Engine/GlobalEngine/SpheresFactory.cpp	2010-02-02 09:59:57 +0000
@@ -11,10 +11,6 @@
 #include<yade/pkg-common/Aabb.hpp>
 #include<yade/pkg-common/Sphere.hpp>
 #include<yade/pkg-common/Facet.hpp>
-#ifdef YADE_GEOMETRICALMODEL
-	#include<yade/pkg-common/FacetModel.hpp>
-	#include<yade/pkg-common/SphereModel.hpp>
-#endif
 #include<yade/pkg-dem/BodyMacroParameters.hpp>
 #include<yade/lib-pyutil/gil.hpp>
 #include"SpheresFactory.hpp"
@@ -172,15 +168,6 @@
 
 	aabb->diffuseColor		= Vector3r(0,1,0);
 
-	#ifdef YADE_GEOMETRICALMODEL
-		shared_ptr<SphereModel> gSphere(new SphereModel);
-		gSphere->radius			= r;
-		gSphere->diffuseColor	= color;
-		gSphere->wire			= false;
-		gSphere->shadowCaster	= true;
-		body->geometricalModel		= gSphere;
-	#endif
-	
 	iSphere->radius			= r;
 	iSphere->diffuseColor	= Vector3r(0.8,0.3,0.3);
 

=== renamed directory 'pkg/dem/DataClass/PhysicalParameters' => 'pkg/dem/DataClass/Material'
=== modified file 'pkg/dem/Engine/GlobalEngine/CohesionlessMomentRotation.cpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/GlobalEngine/CohesionlessMomentRotation.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/GlobalEngine/CundallStrack.cpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/GlobalEngine/CundallStrack.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/GlobalEngine/GlobalStiffnessTimeStepper.cpp'
--- pkg/dem/Engine/GlobalEngine/GlobalStiffnessTimeStepper.cpp	2010-01-10 09:09:32 +0000
+++ pkg/dem/Engine/GlobalEngine/GlobalStiffnessTimeStepper.cpp	2010-02-02 09:59:57 +0000
@@ -39,8 +39,6 @@
 {
 	const State* sdec=body->state.get();
 	
-	// SphereModel* sphere = static_cast<SphereModel*>(body->geometricalModel.get());
-	
 	Vector3r&  stiffness= stiffnesses[body->getId()];
 	Vector3r& Rstiffness=Rstiffnesses[body->getId()];
 

=== modified file 'pkg/dem/Engine/GlobalEngine/TesselationWrapper.cpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/GlobalEngine/TesselationWrapper.hpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/PartialEngine/FlowEngine.cpp' (properties changed: +x to -x)
=== modified file 'pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp'
--- pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp	2010-01-10 09:09:32 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp	2010-02-02 09:59:57 +0000
@@ -13,7 +13,6 @@
 //#include <yade/pkg-dem/TriaxialStressController.hpp>
 #include <yade/pkg-dem/TriaxialCompressionEngine.hpp>
 #include<yade/pkg-common/Sphere.hpp>
-//#include <yade/pkg-common/SphereModel.hpp>
 
 //#include <yade/pkg-dem/ScGeom.hpp>
 //#include <yade/pkg-dem/FrictPhys.hpp>

=== modified file 'pkg/dem/Engine/PartialEngine/TriaxialStressController.cpp'
--- pkg/dem/Engine/PartialEngine/TriaxialStressController.cpp	2010-01-10 09:09:32 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialStressController.cpp	2010-02-02 09:59:57 +0000
@@ -16,9 +16,6 @@
 
 
 #include<yade/core/Scene.hpp>
-#ifdef YADE_GEOMETRICALMODEL
-	#include<yade/pkg-common/SphereModel.hpp>
-#endif
 
 CREATE_LOGGER(TriaxialStressController);
 
@@ -324,9 +321,6 @@
 		{
 			( static_cast<Sphere*> ( ( *bi )->shape.get() ) )->radius *= multiplier;
 			//( static_cast<SphereModel*> ( ( *bi )->geometricalModel.get() ) )->radius *= multiplier;
-			#ifdef YADE_GEOMETRICALMODEL
-				SphereModel* s = dynamic_cast<SphereModel*> ( ( *bi )->geometricalModel.get() ); if(s) s->radius *= multiplier;
-			#endif
 				(*bi)->state->mass*=pow(multiplier,3);
 				(*bi)->state->inertia*=pow(multiplier,5);
 

=== modified file 'pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp'
--- pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp	2010-01-07 16:13:54 +0000
+++ pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp	2010-02-02 09:59:57 +0000
@@ -19,10 +19,6 @@
 #include <yade/pkg-dem/TriaxialStateRecorder.hpp>
 
 #include<yade/pkg-common/Aabb.hpp>
-#ifdef YADE_GEOMETRICALMODEL
-	#include<yade/pkg-common/SphereModel.hpp>
-	#include<yade/pkg-common/BoxModel.hpp>
-#endif
 #include<yade/core/Scene.hpp>
 #include<yade/pkg-common/InsertionSortCollider.hpp>
 #include<yade/lib-serialization/IOFormatManager.hpp>
@@ -290,9 +286,6 @@
 	body = shared_ptr<Body>(new Body(body_id_t(0),2));
 	shared_ptr<CohesiveFrictionalMat> physics(new CohesiveFrictionalMat);
 	shared_ptr<Aabb> aabb(new Aabb);
-// 	#ifdef YADE_GEOMETRICALMODEL
-// 		shared_ptr<SphereModel> gSphere(new SphereModel);
-// 	#endif
 	shared_ptr<Sphere> iSphere(new Sphere);
 	
 	Quaternionr q(Mathr::SymmetricRandom(),Mathr::SymmetricRandom(),Mathr::SymmetricRandom(),Mathr::SymmetricRandom());

=== modified file 'pkg/dem/PreProcessor/STLImporter.cpp'
--- pkg/dem/PreProcessor/STLImporter.cpp	2009-12-13 20:30:13 +0000
+++ pkg/dem/PreProcessor/STLImporter.cpp	2010-02-02 09:59:57 +0000
@@ -34,19 +34,9 @@
 		Vector3r icc = Shop::inscribedCircleCenter(v[0],v[1],v[2]);
 		shared_ptr<Facet> iFacet(new Facet);
 		iFacet->diffuseColor    = Vector3r(0.8,0.3,0.3);
-		#ifdef YADE_GEOMETRICALMODEL
-			shared_ptr<FacetModel> gFacet(new FacetModel);
-			gFacet->diffuseColor    = Vector3r(0.5,0.5,0.5);
-			gFacet->wire	    = wire;
-			gFacet->shadowCaster    = true;
-			(*bodies)[b_id]->geometricalModel	= gFacet;
-		#endif
 		for (int j=0; j<3; ++j)
 		{   
 				iFacet->vertices.push_back(v[j]-icc);
-				#ifdef YADE_GEOMETRICALMODEL
-					gFacet->vertices.push_back(v[j]-icc);
-				#endif
 		}
 		//iFacet->postProcessAttributes(true); //postProcessAttributes is protected
 		shared_ptr<Body> b(new Body());

=== modified file 'pkg/dem/PreProcessor/STLImporter.hpp'
--- pkg/dem/PreProcessor/STLImporter.hpp	2009-12-13 20:30:13 +0000
+++ pkg/dem/PreProcessor/STLImporter.hpp	2010-02-02 09:59:57 +0000
@@ -6,9 +6,6 @@
 *  GNU General Public License v2 or later. See file LICENSE for details. *
 *************************************************************************/
 #pragma once
-#ifdef YADE_GEOMETRICALMODEL
-	#include<yade/pkg-common/FacetModel.hpp>
-#endif
 #include<yade/pkg-common/Facet.hpp>
 #include<yade/core/Body.hpp>
 #include<yade/core/BodyContainer.hpp>

=== modified file 'pkg/dem/PreProcessor/STLImporterTest.cpp'
--- pkg/dem/PreProcessor/STLImporterTest.cpp	2009-12-25 14:46:48 +0000
+++ pkg/dem/PreProcessor/STLImporterTest.cpp	2010-02-02 09:59:57 +0000
@@ -11,10 +11,6 @@
 #include<yade/pkg-common/SpatialQuickSortCollider.hpp>
 #include<yade/pkg-dem/STLImporter.hpp>
 #include<yade/pkg-common/Facet.hpp>
-#ifdef YADE_GEOMETRICALMODEL
-	#include<yade/pkg-common/FacetModel.hpp>
-	#include<yade/pkg-common/SphereModel.hpp>
-#endif
 #include<yade/core/Body.hpp>
 #include<yade/core/Interaction.hpp>
 #include<yade/core/Scene.hpp>
@@ -179,15 +175,6 @@
 
 	aabb->diffuseColor		= Vector3r(0,1,0);
 
-	#ifdef YADE_GEOMETRICALMODEL
-		shared_ptr<SphereModel> gSphere(new SphereModel);
-		gSphere->radius			= radius;
-		gSphere->diffuseColor		= Vector3r(Mathr::UnitRandom(),Mathr::UnitRandom(),Mathr::UnitRandom());
-		gSphere->wire			= false;
-		gSphere->shadowCaster		= true;
-		body->geometricalModel		= gSphere;
-	#endif
-	
 	iSphere->radius			= radius;
 	iSphere->diffuseColor		= Vector3r(0.8,0.3,0.3);
 

=== modified file 'pkg/dem/PreProcessor/TriaxialTest.cpp'
--- pkg/dem/PreProcessor/TriaxialTest.cpp	2010-01-10 09:09:32 +0000
+++ pkg/dem/PreProcessor/TriaxialTest.cpp	2010-02-02 09:59:57 +0000
@@ -353,12 +353,6 @@
 		for(int i=0; i<3; i++){ iFacet->vertices.push_back(v[i]-cog);}
 		iFacet->diffuseColor=Vector3r(1,1,1);
 		body->shape=iFacet;
-		#ifdef YADE_GEOMETRICALMODEL
-			shared_ptr<FacetModel> facet(new FacetModel);
-			for(int i=0; i<3; i++){ facet->vertices.push_back(v[i]-cog);}
-			facet->wire=true;
-			body->geometricalModel=facet;
-		#endif
 	}
 	if(wallWalls){
 		shared_ptr<Wall> wall(new Wall);

=== modified file 'pkg/dem/PreProcessor/TriaxialTestWater.cpp'
--- pkg/dem/PreProcessor/TriaxialTestWater.cpp	2010-01-10 09:09:32 +0000
+++ pkg/dem/PreProcessor/TriaxialTestWater.cpp	2010-02-02 09:59:57 +0000
@@ -362,9 +362,6 @@
 	body = shared_ptr<Body>(new Body(body_id_t(0),2));
 	shared_ptr<FrictMat> physics(new FrictMat);
 	shared_ptr<Aabb> aabb(new Aabb);
-// 	#ifdef YADE_GEOMETRICALMODEL
-// 		shared_ptr<BoxModel> gBox(new BoxModel);	
-// 	#endif
 	shared_ptr<Box> iBox(new Box);
 	
 	Quaternionr q;

=== modified file 'pkg/dem/meta/Shop.cpp'
--- pkg/dem/meta/Shop.cpp	2010-01-10 09:09:32 +0000
+++ pkg/dem/meta/Shop.cpp	2010-02-02 09:59:57 +0000
@@ -13,11 +13,6 @@
 #include<yade/pkg-common/Aabb.hpp>
 #include<yade/pkg-common/InsertionSortCollider.hpp>
 
-#ifdef YADE_GEOMETRICALMODEL
-	#include<yade/pkg-common/SphereModel.hpp>
-	#include<yade/pkg-common/BoxModel.hpp>
-#endif
-
 #include<yade/pkg-common/Box.hpp>
 #include<yade/pkg-common/Sphere.hpp>
 #include<yade/pkg-common/ElastMat.hpp>

=== modified file 'py/_utils.cpp'
--- py/_utils.cpp	2010-01-24 09:21:49 +0000
+++ py/_utils.cpp	2010-02-02 09:59:57 +0000
@@ -171,20 +171,6 @@
 {
 	return Shop::inscribedCircleCenter(v0,v1,v2);
 }
-#ifdef YADE_PHYSPAR
-#include<yade/pkg-dem/SimpleViscoelasticBodyParameters.hpp>
-	python::dict getViscoelasticFromSpheresInteraction(Real m, Real tc, Real en, Real es)
-	{
-		 shared_ptr<SimpleViscoelasticBodyParameters> b = shared_ptr<SimpleViscoelasticBodyParameters>(new SimpleViscoelasticBodyParameters());
-		 Shop::getViscoelasticFromSpheresInteraction(m,tc,en,es,b);
-		python::dict d;
-		d["kn"]=b->kn;
-		d["cn"]=b->cn;
-		d["ks"]=b->ks;
-		d["cs"]=b->cs;
-		 return d;
-	}
-#endif
 python::dict getViscoelasticFromSpheresInteraction(Real m, Real tc, Real en, Real es)
 {
 	shared_ptr<SimpleViscoelasticMat> b = shared_ptr<SimpleViscoelasticMat>(new SimpleViscoelasticMat());

=== modified file 'py/yadeWrapper/customConverters.cpp'
--- py/yadeWrapper/customConverters.cpp	2010-01-01 15:21:30 +0000
+++ py/yadeWrapper/customConverters.cpp	2010-02-02 09:59:57 +0000
@@ -31,15 +31,6 @@
 #include<yade/core/Engine.hpp>
 
 #include<yade/pkg-common/BoundFunctor.hpp>
-#ifdef YADE_GEOMETRICALMODEL
-	#include<yade/pkg-common/GeometricalModelEngineUnit.hpp>
-#endif
-#ifdef YADE_PHYSPAR
-	#include<yade/pkg-common/StateEngineUnit.hpp>
-	#include<yade/pkg-common/PhysicalActionDamperUnit.hpp>
-	#include<yade/pkg-common/PhysicalActionApplierUnit.hpp>
-#endif
-#include<yade/pkg-common/InteractingGeometryEngineUnit.hpp>
 #include<yade/pkg-common/InteractionGeometryFunctor.hpp>
 #include<yade/pkg-common/InteractionPhysicsFunctor.hpp>
 #include<yade/pkg-common/LawFunctor.hpp>
@@ -170,17 +161,8 @@
 
   #define VECTOR_ENGINE_UNIT(ENGINE_UNIT) custom_vector_from_seq<shared_ptr<ENGINE_UNIT> >(); to_python_converter<std::vector<shared_ptr<ENGINE_UNIT> >,custom_vector_to_list<shared_ptr<ENGINE_UNIT> > >();
 		VECTOR_ENGINE_UNIT(BoundFunctor)
-		#ifdef YADE_GEOMETRICALMODEL
-			VECTOR_ENGINE_UNIT(GeometricalModelEngineUnit)
-			VECTOR_ENGINE_UNIT(InteractingGeometryEngineUnit)
-		#endif
 		VECTOR_ENGINE_UNIT(InteractionGeometryFunctor)
 		VECTOR_ENGINE_UNIT(InteractionPhysicsFunctor)
-		#ifdef YADE_PHYSPAR
-			VECTOR_ENGINE_UNIT(StateEngineUnit)
-			VECTOR_ENGINE_UNIT(PhysicalActionDamperUnit)
-			VECTOR_ENGINE_UNIT(PhysicalActionApplierUnit)
-		#endif
 		VECTOR_ENGINE_UNIT(LawFunctor)
 	#undef VECTOR_ENGINE_UNIT
 }

=== modified file 'py/yadeWrapper/yadeWrapper.cpp'
--- py/yadeWrapper/yadeWrapper.cpp	2010-01-24 09:21:49 +0000
+++ py/yadeWrapper/yadeWrapper.cpp	2010-02-02 09:59:57 +0000
@@ -48,7 +48,6 @@
 #include<yade/pkg-common/Aabb.hpp>
 
 #include<yade/pkg-common/BoundFunctor.hpp>
-#include<yade/pkg-common/InteractingGeometryEngineUnit.hpp>
 #include<yade/pkg-common/InteractionGeometryFunctor.hpp>
 #include<yade/pkg-common/InteractionPhysicsFunctor.hpp>
 #include<yade/pkg-common/LawFunctor.hpp>

Follow ups

Re: [Branch ~yade-dev/yade/trunk] Rev 1997: 1. Moved all (most) unused files to attic/* (such as those that have YADE_REQUIRE_FEATURE(PHYSPAR...
From: Jerome Duriez, 2010-02-02