yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2090
committer: Bruno Chareyre <bchareyre@r1arduina>
branch nick: trunk
timestamp: Thu 2010-03-18 19:44:02 +0100
message:
  - Missing in previous commit and creating compile error, sorry for that.
modified:
  pkg/dem/PreProcessor/TriaxialTest.cpp
  pkg/dem/PreProcessor/TriaxialTest.hpp


--
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/PreProcessor/TriaxialTest.cpp'
--- pkg/dem/PreProcessor/TriaxialTest.cpp	2010-02-02 11:05:09 +0000
+++ pkg/dem/PreProcessor/TriaxialTest.cpp	2010-03-18 18:44:02 +0000
@@ -121,7 +121,7 @@
 	biaxial2dTest=false;
 	radiusStdDev=0.3;
 	radiusMean=-1; // no radius specified
-	isotropicCompaction=false;
+	fixedPoroCompaction=false;
 	fixedPorosity = 1;
 	fast=false;
 	noFiles=false;
@@ -311,13 +311,14 @@
 	body->state->pos=position;
 	shared_ptr<FrictMat> mat(new FrictMat);
 	mat->young			= sphereYoungModulus;
-	mat->poisson		= sphereKsDivKn;
+	mat->poisson			= sphereKsDivKn;
 	mat->frictionAngle		= compactionFrictionDeg * Mathr::PI/180.0;
 	aabb->diffuseColor		= Vector3r(0,1,0);
 	iSphere->radius			= radius;
-	iSphere->diffuseColor		= Vector3r(Mathr::UnitRandom(),Mathr::UnitRandom(),Mathr::UnitRandom());
+	//iSphere->diffuseColor		= Vector3r(0.4,0.1,0.1);
+	iSphere->diffuseColor           = Vector3r(Mathr::UnitRandom(),Mathr::UnitRandom(),Mathr::UnitRandom());
 	body->shape	= iSphere;
-	body->bound		= aabb;
+	body->bound	= aabb;
 	body->material	= mat;
 }
 
@@ -418,7 +419,7 @@
 	triaxialcompressionEngine->noFiles=noFiles;
 	triaxialcompressionEngine->frictionAngleDegree = sphereFrictionDeg;
 	triaxialcompressionEngine->fixedPorosity = fixedPorosity;
-	triaxialcompressionEngine->isotropicCompaction = isotropicCompaction;	
+	triaxialcompressionEngine->fixedPoroCompaction = fixedPoroCompaction;	
 	// recording global stress
 	if(recordIntervalIter>0 && !noFiles){
 		triaxialStateRecorder = shared_ptr<TriaxialStateRecorder>(new TriaxialStateRecorder);

=== modified file 'pkg/dem/PreProcessor/TriaxialTest.hpp'
--- pkg/dem/PreProcessor/TriaxialTest.hpp	2010-02-09 20:22:04 +0000
+++ pkg/dem/PreProcessor/TriaxialTest.hpp	2010-03-18 18:44:02 +0000
@@ -100,7 +100,7 @@
 				,saveAnimationSnapshots
 				,biaxial2dTest
 				//!flag to choose an isotropic compaction until a fixed porosity choosing a same translation speed for the six walls
-				,isotropicCompaction
+				,fixedPoroCompaction
 				//! do not create any files during run (.xml, .spheres, wall stress records)
 				,noFiles
 				// use Facets instead of Boxes for the walls
@@ -193,7 +193,7 @@
 		(sigmaIsoCompaction)
 		(sigmaLateralConfinement)
 		(Key)
-		(isotropicCompaction)
+		(fixedPoroCompaction)
 		(fixedPorosity)
 		(fixedBoxDims)
 		(fast)