← Back to team overview

yade-dev team mailing list archive

[Branch ~yade-dev/yade/trunk] Rev 1896: 1. Rename SpheresContactGeometry to ScGeom

 

------------------------------------------------------------
revno: 1896
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Sun 2009-12-13 21:11:31 +0100
message:
  1. Rename SpheresContactGeometry to ScGeom
  2. Rename corresponding functors:
  InteractingBox2InteractingSphere4SpheresContactGeometry -> Ig2_Box_Sphere_ScGeom
  InteractingFacet2InteractingSphere4SpheresContactGeometry -> Ig2_Facet_Sphere_ScGeom
  InteractingSphere2InteractingSphere4SpheresContactGeometry -> Ig2_Sphere_Sphere_ScGeom
renamed:
  pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.cpp => pkg/dem/DataClass/InteractionGeometry/ScGeom.cpp
  pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.hpp => pkg/dem/DataClass/InteractionGeometry/ScGeom.hpp
  pkg/dem/Engine/Functor/InteractingBox2InteractingSphere4SpheresContactGeometry.cpp => pkg/dem/Engine/Functor/Ig2_Box_Sphere_ScGeom.cpp
  pkg/dem/Engine/Functor/InteractingBox2InteractingSphere4SpheresContactGeometry.hpp => pkg/dem/Engine/Functor/Ig2_Box_Sphere_ScGeom.hpp
  pkg/dem/Engine/Functor/InteractingFacet2InteractingSphere4SpheresContactGeometry.cpp => pkg/dem/Engine/Functor/Ig2_Facet_Sphere_ScGeom.cpp
  pkg/dem/Engine/Functor/InteractingFacet2InteractingSphere4SpheresContactGeometry.hpp => pkg/dem/Engine/Functor/Ig2_Facet_Sphere_ScGeom.hpp
  pkg/dem/Engine/Functor/InteractingSphere2InteractingSphere4SpheresContactGeometry.cpp => pkg/dem/Engine/Functor/Ig2_Sphere_Sphere_ScGeom.cpp
  pkg/dem/Engine/Functor/InteractingSphere2InteractingSphere4SpheresContactGeometry.hpp => pkg/dem/Engine/Functor/Ig2_Sphere_Sphere_ScGeom.hpp
modified:
  examples/STLImporterTest.py
  examples/buldozerVTK.py
  examples/dynamic_simulation_tests/ringCundallDamping.py
  examples/dynamic_simulation_tests/ringSimpleViscoelastic.py
  examples/rod_penetration/model.py
  pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_SphereSphere.cpp
  pkg/dem/DataClass/InteractionGeometry/DemXDofGeom.hpp
  pkg/dem/Engine/Functor/BasicViscoelasticRelationships.cpp
  pkg/dem/Engine/Functor/CL1Relationships.cpp
  pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp
  pkg/dem/Engine/Functor/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.cpp
  pkg/dem/Engine/Functor/MacroMicroElasticRelationships.cpp
  pkg/dem/Engine/Functor/SimpleElasticRelationships.cpp
  pkg/dem/Engine/Functor/SimpleElasticRelationshipsWater.cpp
  pkg/dem/Engine/Functor/SimpleViscoelasticRelationships.cpp
  pkg/dem/Engine/Functor/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp
  pkg/dem/Engine/Functor/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.hpp
  pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.cpp
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp
  pkg/dem/Engine/GlobalEngine/ContactLaw1.cpp
  pkg/dem/Engine/GlobalEngine/ElasticCohesiveLaw.cpp
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp
  pkg/dem/Engine/GlobalEngine/ElasticCriterionTimeStepper.cpp
  pkg/dem/Engine/GlobalEngine/GlobalStiffnessTimeStepper.cpp
  pkg/dem/Engine/GlobalEngine/HistoryRecorder.cpp
  pkg/dem/Engine/GlobalEngine/MicroMacroAnalyser.cpp
  pkg/dem/Engine/GlobalEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp
  pkg/dem/Engine/GlobalEngine/SimpleViscoelasticSpheresInteractionRecorder.hpp
  pkg/dem/Engine/GlobalEngine/ViscousForceDamping.cpp
  pkg/dem/Engine/GlobalEngine/VolumicContactLaw.cpp
  pkg/dem/Engine/PartialEngine/ContactStressRecorder.cpp
  pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp
  pkg/dem/Engine/PartialEngine/TriaxialStressController.cpp
  pkg/dem/Engine/PartialEngine/WallStressRecorder.cpp
  pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp
  pkg/dem/PreProcessor/DirectShearCis.cpp
  pkg/dem/PreProcessor/Funnel.cpp
  pkg/dem/PreProcessor/ModifiedTriaxialTest.cpp
  pkg/dem/PreProcessor/SDECImpactTest.cpp
  pkg/dem/PreProcessor/SDECLinkedSpheres.cpp
  pkg/dem/PreProcessor/SDECMovingWall.cpp
  pkg/dem/PreProcessor/SDECSpheresPlane.cpp
  pkg/dem/PreProcessor/STLImporterTest.cpp
  pkg/dem/PreProcessor/SimpleScene.cpp
  pkg/dem/PreProcessor/SimpleShear.cpp
  pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp
  pkg/dem/PreProcessor/ThreePointBending.cpp
  pkg/dem/PreProcessor/TriaxialTest.cpp
  pkg/dem/PreProcessor/TriaxialTestWater.cpp
  pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp
  pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.cpp
  pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.cpp
  pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.hpp
  pkg/dem/meta/ConcretePM.hpp
  pkg/dem/meta/RockPM.hpp
  pkg/dem/meta/Shop.cpp
  pkg/dem/meta/ViscoelasticPM.cpp
  pkg/dem/meta/ViscoelasticPM.hpp
  pkg/snow/DataClass/IstSnowLayersContact.hpp
  pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact.cpp
  pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact.hpp
  pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeSpheresContactGeometry.cpp
  pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeSpheresContactGeometry.hpp
  pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp
  pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.hpp
  pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeSpheresContactGeometry.cpp
  pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeSpheresContactGeometry.hpp
  pkg/snow/Engine/ElawSnowLayersDeformation.cpp
  pkg/snow/PreProcessor/SnowCreepTest.cpp
  pkg/snow/PreProcessor/SnowVoxelsLoader.cpp
  pkg/snow/RenderingEngine/Ef1_IstSnowLayersContact_glDraw.cpp
  py/_utils.cpp
  py/system.py
  py/utils.py
  scripts/chain-distant-interactions.py
  scripts/constitutive-law.py
  scripts/cylindrical-layer-packing.py
  scripts/exact-rot-facet.py
  scripts/exact-rot.py
  scripts/multi.py
  scripts/rename-class.py
  scripts/simple-scene-parallel.py
  scripts/simple-scene-player.py
  scripts/simple-scene-plot.py
  scripts/simple-scene-video.py
  scripts/simple-scene.py
  scripts/test-sphere-facet-corner.py
  scripts/test/ResetRandomPosition.py
  scripts/test/clump-hopper-viscoelastic.py
  scripts/test/clump-inbox-viscoelastic.py
  scripts/test/clump-viscoelastic.py
  scripts/test/clump.py
  scripts/test/interpolating-force.py
  scripts/test/shear.py
  scripts/test/triax-basic.py
  scripts/test/triax-identical-results.py
  pkg/dem/DataClass/InteractionGeometry/ScGeom.cpp
  pkg/dem/DataClass/InteractionGeometry/ScGeom.hpp
  pkg/dem/Engine/Functor/Ig2_Box_Sphere_ScGeom.cpp
  pkg/dem/Engine/Functor/Ig2_Box_Sphere_ScGeom.hpp
  pkg/dem/Engine/Functor/Ig2_Facet_Sphere_ScGeom.cpp
  pkg/dem/Engine/Functor/Ig2_Facet_Sphere_ScGeom.hpp
  pkg/dem/Engine/Functor/Ig2_Sphere_Sphere_ScGeom.cpp
  pkg/dem/Engine/Functor/Ig2_Sphere_Sphere_ScGeom.hpp
The size of the diff (2376 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.