yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2159
committer: Bruno Chareyre <bchareyre@r1arduina>
branch nick: trunk
timestamp: Mon 2010-04-19 15:29:06 +0200
message:
  -Use new names.
modified:
  pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.cpp
  pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp
  pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp
  pkg/dem/PreProcessor/CohesiveTriaxialTest.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 'pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.cpp'
--- pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.cpp	2010-03-31 16:24:16 +0000
+++ pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.cpp	2010-04-19 13:29:06 +0000
@@ -19,7 +19,7 @@
 #include<yade/pkg-dem/FrictPhys.hpp>
 #include<yade/pkg-common/ElastMat.hpp>
 
-class CohesiveFrictionalRelationships;
+class Ip2_2xCohFrictMat_CohFrictPhys;
 
 CREATE_LOGGER(ThreeDTriaxialEngine);
 YADE_PLUGIN((ThreeDTriaxialEngine));

=== modified file 'pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp'
--- pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp	2010-04-18 15:52:40 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp	2010-04-19 13:29:06 +0000
@@ -18,7 +18,7 @@
 #include<yade/pkg-dem/FrictPhys.hpp>
 #include<yade/pkg-common/ElastMat.hpp>
 
-class CohesiveFrictionalRelationships;
+class Ip2_2xCohFrictMat_CohFrictPhys;
 
 CREATE_LOGGER(TriaxialCompressionEngine);
 YADE_PLUGIN((TriaxialCompressionEngine));

=== modified file 'pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp'
--- pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp	2010-04-13 21:09:57 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp	2010-04-19 13:29:06 +0000
@@ -146,25 +146,25 @@
 		((Real,meanStress,0,""))
 		((Real,volumetricStrain,0,""))
  		,
-			/* extra initializers */
+		/* extra initializers */
 		,
    		/* constructor */
    		first = true;
-			stiffness.resize(6);
-			previousTranslation.assign(Vector3r::ZERO);
+		stiffness.resize(6);
+		previousTranslation.assign(Vector3r::ZERO);
 			for (int i=0; i<6; ++i){
 				normal[i] = stress[i] = force[i] = Vector3r::ZERO;
 				stiffness[i] = 0;
 			}
-			for (int i=0; i<3; ++i) strain[i] = 0;
-			normal[wall_bottom].Y()=1;
-			normal[wall_top].Y()=-1;
-			normal[wall_left].X()=1;
-			normal[wall_right].X()=-1;
-			normal[wall_front].Z()=-1;
-			normal[wall_back].Z()=1;	
-			porosity=1;
+		normal[wall_bottom].Y()=1;
+		normal[wall_top].Y()=-1;
+		normal[wall_left].X()=1;
+		normal[wall_right].X()=-1;
+		normal[wall_front].Z()=-1;
+		normal[wall_back].Z()=1;	
+		porosity=1;
 		,
+		.def_readonly("strain",&TriaxialStressController::strain,"")
  		.def_readonly("porosity",&TriaxialStressController::porosity,"")
 		.def_readonly("boxVolume",&TriaxialStressController::boxVolume,"")
 		.def_readonly("max_vel1",&TriaxialStressController::max_vel1,"|ycomp|")

=== modified file 'pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp'
--- pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp	2010-04-19 10:18:42 +0000
+++ pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp	2010-04-19 13:29:06 +0000
@@ -9,8 +9,8 @@
 #include "CohesiveTriaxialTest.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/GlobalStiffnessTimeStepper.hpp>
 #include<yade/pkg-dem/PositionOrientationRecorder.hpp>
 
@@ -25,7 +25,11 @@
 #include<yade/pkg-common/BoundDispatcher.hpp>
 
 #include<yade/pkg-common/GravityEngines.hpp>
+<<<<<<< TREE
+//#include<yade/pkg-dem/HydraulicForceEngine.hpp>
+=======
 // #include<yade/pkg-dem/HydraulicForceEngine.hpp>
+>>>>>>> MERGE-SOURCE
 #include<yade/pkg-dem/NewtonIntegrator.hpp>
 #include<yade/pkg-dem/Ig2_Sphere_Sphere_ScGeom.hpp>
 #include<yade/pkg-dem/Ig2_Box_Sphere_ScGeom.hpp>
@@ -283,7 +287,7 @@
 void CohesiveTriaxialTest::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<Sphere> iSphere(new Sphere);
 	
@@ -327,7 +331,7 @@
 void CohesiveTriaxialTest::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<Box> iBox(new Box);
@@ -375,7 +379,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;
@@ -415,12 +419,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-> file 	= WallStressRecordFile;