← Back to team overview

yade-dev team mailing list archive

  1. yade-dev team
  2. Mailing list archive
  3. Message #04037

[Branch ~yade-dev/yade/trunk] Rev 2157: - New names in Attic files (follow-up of r2156, more to come).

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 2157
committer: Bruno Chareyre <bchareyre@r1arduina>
branch nick: trunk
timestamp: Mon 2010-04-19 15:18:45 +0200
message:
  - New names in Attic files (follow-up of r2156, more to come).
modified:
  attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp
  attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp
  attic/pkg/snow/Engine/ElawSnowLayersDeformation.cpp
  attic/pkg/snow/PreProcessor/SnowCreepTest.cpp
  attic/pkg/snow/PreProcessor/SnowVoxelsLoader.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 'attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp'
--- attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp	2010-02-02 09:59:57 +0000
+++ attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp	2010-04-19 13:18:45 +0000
@@ -7,7 +7,7 @@
 *************************************************************************/
 
 #include "GLDrawCohesiveFrictionalContactInteraction.hpp"
-#include<yade/pkg-dem/CohesiveFrictionalContactInteraction.hpp>
+#include<yade/pkg-dem/CohFrictPhys.hpp>
 #include<yade/pkg-dem/ScGeom.hpp>
 #include<yade/pkg-common/NormShearPhys.hpp>
 #include<yade/pkg-dem/FrictPhys.hpp>
@@ -99,7 +99,7 @@
 	if(!i->isReal()) return;
 	isReal=i->isReal();
 
-	CohesiveFrictionalContactInteraction*    ph = static_cast<CohesiveFrictionalContactInteraction*>(ih.get());
+	CohFrictPhys*    ph = static_cast<CohFrictPhys*>(ih.get());
 	ScGeom*    sc = static_cast<ScGeom*>(i->interactionGeometry.get());
 	Vector3r pos1   = b1->physicalParameters->se3.position;
 	Vector3r pos2   = b2->physicalParameters->se3.position;

=== modified file 'attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp'
--- attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp	2010-02-02 09:59:57 +0000
+++ attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp	2010-04-19 13:18:45 +0000
@@ -22,7 +22,7 @@
 		void drawFlatText(const Vector3r pos,const std::string txt);
 		Vector3r drawRotationAxis(const Quaternionr q,const std::string txt,const Vector3r pos,const Real size,const Vector3r color);
 
-	RENDERS(CohesiveFrictionalContactInteraction);
+	RENDERS(CohFrictPhys);
 	REGISTER_CLASS_NAME(GLDrawCohesiveFrictionalContactInteraction);
 	REGISTER_BASE_CLASS_NAME(GlInteractionPhysicsFunctor);
 };

=== modified file 'attic/pkg/snow/Engine/ElawSnowLayersDeformation.cpp'
--- attic/pkg/snow/Engine/ElawSnowLayersDeformation.cpp	2010-04-03 16:40:33 +0000
+++ attic/pkg/snow/Engine/ElawSnowLayersDeformation.cpp	2010-04-19 13:18:45 +0000
@@ -7,9 +7,9 @@
 *************************************************************************/
 
 #include"ElawSnowLayersDeformation.hpp"
-#include<yade/pkg-dem/CohesiveFrictionalMat.hpp>
+#include<yade/pkg-dem/CohFrictMat.hpp>
 #include<yade/pkg-dem/ScGeom.hpp>
-#include<yade/pkg-dem/CohesiveFrictionalContactInteraction.hpp>
+#include<yade/pkg-dem/CohFrictPhys.hpp>
 #include<yade/pkg-dem/SDECLinkPhysics.hpp>
 #include<yade/core/Omega.hpp>
 #include<yade/core/Scene.hpp>
@@ -51,10 +51,10 @@
 
 			std::cerr << __FILE__ << " " << id1 << " " << id2 << "\n";
 
-			CohesiveFrictionalMat* de1 			= YADE_CAST<CohesiveFrictionalMat*>((*bodies)[id1]->physicalParameters.get());
-			CohesiveFrictionalMat* de2 			= YADE_CAST<CohesiveFrictionalMat*>((*bodies)[id2]->physicalParameters.get());
+			CohFrictMat* de1 			= YADE_CAST<CohFrictMat*>((*bodies)[id1]->physicalParameters.get());
+			CohFrictMat* de2 			= YADE_CAST<CohFrictMat*>((*bodies)[id2]->physicalParameters.get());
 //			ScGeom* currentContactGeometry		= YADE_CAST<ScGeom*>(contact->interactionGeometry.get());
-			CohesiveFrictionalContactInteraction* currentContactPhysics = YADE_CAST<CohesiveFrictionalContactInteraction*> (contact->interactionPhysics.get());
+			CohFrictPhys* currentContactPhysics = YADE_CAST<CohFrictPhys*> (contact->interactionPhysics.get());
 
 			BssSnowGrain* b1 = dynamic_cast<BssSnowGrain*>((*bodies)[id1]->shape.get());
 			BssSnowGrain* b2 = dynamic_cast<BssSnowGrain*>((*bodies)[id2]->shape.get());

=== modified file 'attic/pkg/snow/PreProcessor/SnowCreepTest.cpp'
--- attic/pkg/snow/PreProcessor/SnowCreepTest.cpp	2009-12-25 14:46:48 +0000
+++ attic/pkg/snow/PreProcessor/SnowCreepTest.cpp	2010-04-19 13:18:45 +0000
@@ -13,8 +13,8 @@
 #include "SnowCreepTest.hpp"
 
 #include<yade/pkg-dem/CohesiveFrictionalContactLaw.hpp>
-#include<yade/pkg-dem/CohesiveFrictionalRelationships.hpp>
-#include<yade/pkg-dem/CohesiveFrictionalMat.hpp>
+#include<yade/pkg-dem/Ip2_2xCohFrictMat_CohFrictPhys.hpp>
+#include<yade/pkg-dem/CohFrictMat.hpp>
 #include<yade/pkg-dem/SDECLinkPhysics.hpp>
 #include<yade/pkg-dem/GlobalStiffnessTimeStepper.hpp>
 #include<yade/pkg-dem/PositionOrientationRecorder.hpp>
@@ -36,7 +36,6 @@
 #include<yade/pkg-common/BoundDispatcher.hpp>
 
 #include<yade/pkg-common/GravityEngines.hpp>
-#include<yade/pkg-dem/HydraulicForceEngine.hpp>
 #include<yade/pkg-dem/Ig2_Sphere_Sphere_ScGeom.hpp>
 #include<yade/pkg-dem/Ig2_Box_Sphere_ScGeom.hpp>
 #include<yade/pkg-common/PhysicalActionApplier.hpp>
@@ -373,7 +372,7 @@
 void SnowCreepTest::createSphere(shared_ptr<Body>& body, Vector3r position, Real radius, bool dynamic )
 {
 	body = shared_ptr<Body>(new Body(body_id_t(0),2));
-	shared_ptr<CohesiveFrictionalMat> physics(new CohesiveFrictionalMat);
+	shared_ptr<CohFrictMat> physics(new CohFrictMat);
 	shared_ptr<Aabb> aabb(new Aabb);
 	shared_ptr<SphereModel> gSphere(new SphereModel);
 	shared_ptr<Sphere> iSphere(new Sphere);
@@ -425,7 +424,7 @@
 void SnowCreepTest::createBox(shared_ptr<Body>& body, Vector3r position, Vector3r extents, bool wire)
 {
 	body = shared_ptr<Body>(new Body(body_id_t(0),2));
-	shared_ptr<CohesiveFrictionalMat> physics(new CohesiveFrictionalMat);
+	shared_ptr<CohFrictMat> physics(new CohFrictMat);
 	shared_ptr<Aabb> aabb(new Aabb);
 	shared_ptr<BoxModel> gBox(new BoxModel);
 	shared_ptr<Box> iBox(new Box);
@@ -492,7 +491,7 @@
 	shared_ptr<InteractionGeometryFunctor> s2(new Ig2_Box_Sphere_ScGeom);
 	interactionGeometryDispatcher->add(s2);
 
-	shared_ptr<CohesiveFrictionalRelationships> cohesiveFrictionalRelationships = shared_ptr<CohesiveFrictionalRelationships> (new CohesiveFrictionalRelationships);
+	shared_ptr<Ip2_2xCohFrictMat_CohFrictPhys> cohesiveFrictionalRelationships = shared_ptr<Ip2_2xCohFrictMat_CohFrictPhys> (new Ip2_2xCohFrictMat_CohFrictPhys);
 	cohesiveFrictionalRelationships->shearCohesion = shearCohesion;
 	cohesiveFrictionalRelationships->normalCohesion = normalCohesion;
 	cohesiveFrictionalRelationships->setCohesionOnNewContacts = setCohesionOnNewContacts;
@@ -567,12 +566,8 @@
 	triaxialcompressionEngine->internalCompaction = internalCompaction;
 	triaxialcompressionEngine->maxMultiplier = maxMultiplier;
 	
-	shared_ptr<HydraulicForceEngine> hydraulicForceEngine = shared_ptr<HydraulicForceEngine> (new HydraulicForceEngine);
-	hydraulicForceEngine->dummyParameter = true;
-		
-	//cerr << "fin de section triaxialcompressionEngine = shared_ptr<TriaxialCompressionEngine> (new TriaxialCompressionEngine);" << std::endl;
-	
-// recording global stress
+
+	// recording global stress
 	triaxialStateRecorder = shared_ptr<TriaxialStateRecorder>(new
 	TriaxialStateRecorder);
 	triaxialStateRecorder-> outputFile 	= WallStressRecordFile;
@@ -581,7 +576,6 @@
 	
 	
 	// moving walls to regulate the stress applied
-	//cerr << "triaxialstressController = shared_ptr<TriaxialStressController> (new TriaxialStressController);" << std::endl;
 	triaxialstressController = shared_ptr<TriaxialStressController> (new TriaxialStressController);
 	triaxialstressController-> stiffnessUpdateInterval = 20;// = recordIntervalIter
 	triaxialstressController-> sigma_iso = sigma_iso;

=== modified file 'attic/pkg/snow/PreProcessor/SnowVoxelsLoader.cpp'
--- attic/pkg/snow/PreProcessor/SnowVoxelsLoader.cpp	2009-12-25 14:46:48 +0000
+++ attic/pkg/snow/PreProcessor/SnowVoxelsLoader.cpp	2010-04-19 13:18:45 +0000
@@ -6,8 +6,8 @@
 *************************************************************************/
 
 #include<yade/pkg-dem/CohesiveFrictionalContactLaw.hpp>
-#include<yade/pkg-dem/CohesiveFrictionalRelationships.hpp>
-#include<yade/pkg-dem/CohesiveFrictionalMat.hpp>
+#include<yade/pkg-dem/Ip2_2xCohFrictMat_CohFrictPhys.hpp>
+#include<yade/pkg-dem/CohFrictMat.hpp>
 #include<yade/pkg-dem/SDECLinkPhysics.hpp>
 #include<yade/pkg-dem/GlobalStiffnessTimeStepper.hpp>
 #include<yade/pkg-dem/PositionOrientationRecorder.hpp>
@@ -29,7 +29,6 @@
 #include<yade/pkg-common/BoundDispatcher.hpp>
 
 #include<yade/pkg-common/GravityEngines.hpp>
-#include<yade/pkg-dem/HydraulicForceEngine.hpp>
 #include<yade/pkg-dem/Ig2_Sphere_Sphere_ScGeom.hpp>
 #include<yade/pkg-dem/Ig2_Box_Sphere_ScGeom.hpp>
 #include<yade/pkg-common/PhysicalActionApplier.hpp>
@@ -370,7 +369,7 @@
 	interactionGeometryDispatcher->add(s1);
 	interactionGeometryDispatcher->add(s2);
 
-	shared_ptr<CohesiveFrictionalRelationships> cohesiveFrictionalRelationships = shared_ptr<CohesiveFrictionalRelationships> (new CohesiveFrictionalRelationships);
+	shared_ptr<Ip2_2xCohFrictMat_CohFrictPhys> cohesiveFrictionalRelationships = shared_ptr<Ip2_2xCohFrictMat_CohFrictPhys> (new Ip2_2xCohFrictMat_CohFrictPhys);
 	cohesiveFrictionalRelationships->shearCohesion = shearCohesion;
 	cohesiveFrictionalRelationships->normalCohesion = normalCohesion;
 	cohesiveFrictionalRelationships->setCohesionOnNewContacts = setCohesionOnNewContacts;
@@ -434,11 +433,7 @@
 	triaxialcompressionEngine->internalCompaction = internalCompaction;
 	triaxialcompressionEngine->maxMultiplier = maxMultiplier;
 	
-	shared_ptr<HydraulicForceEngine> hydraulicForceEngine = shared_ptr<HydraulicForceEngine> (new HydraulicForceEngine);
-	hydraulicForceEngine->dummyParameter = true;
-		
-	//cerr << "fin de section triaxialcompressionEngine = shared_ptr<TriaxialCompressionEngine> (new TriaxialCompressionEngine);" << std::endl;
-	
+
 // recording global stress
 	triaxialStateRecorder = shared_ptr<TriaxialStateRecorder>(new TriaxialStateRecorder);
 	triaxialStateRecorder-> outputFile 	= WallStressRecordFile;
@@ -526,7 +521,7 @@
 void SnowVoxelsLoader::create_grain(shared_ptr<Body>& body, Vector3r position, bool dynamic , boost::shared_ptr<BshSnowGrain> grain)
 {
 	body = shared_ptr<Body>(new Body(body_id_t(0),2));
-	shared_ptr<CohesiveFrictionalMat> physics(new CohesiveFrictionalMat);
+	shared_ptr<CohFrictMat> physics(new CohFrictMat);
 	shared_ptr<Aabb> aabb(new Aabb);
 	shared_ptr<BshSnowGrain> gSnowGrain(grain);
 	
@@ -574,7 +569,7 @@
 void SnowVoxelsLoader::create_box(shared_ptr<Body>& body, Vector3r position, Vector3r extents, bool wire)
 {
 	body = shared_ptr<Body>(new Body(body_id_t(0),2));
-	shared_ptr<CohesiveFrictionalMat> physics(new CohesiveFrictionalMat);
+	shared_ptr<CohFrictMat> physics(new CohFrictMat);
 	shared_ptr<Aabb> aabb(new Aabb);
 	shared_ptr<Box> iBox(new Box);
  Thread Previous • Date Previous • • Thread Next