yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1947
committer: Bruno Chareyre <bchareyre@r1arduina>
branch nick: trunk
timestamp: Thu 2010-01-07 17:13:54 +0100
message:
  rename KsOnKn -> KsDivKn.
modified:
  pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp
  pkg/dem/PreProcessor/CohesiveTriaxialTest.hpp
  pkg/dem/PreProcessor/TriaxialTest.cpp
  pkg/dem/PreProcessor/TriaxialTest.hpp
  pkg/dem/PreProcessor/TriaxialTestWater.cpp
  pkg/dem/PreProcessor/TriaxialTestWater.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/CohesiveTriaxialTest.cpp'
--- pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp	2010-01-06 21:35:26 +0000
+++ pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp	2010-01-07 16:13:54 +0000
@@ -121,7 +121,7 @@
 	finalMaxMultiplier = 1.0001;
 	
 	sphereYoungModulus  = 15000000.0;
-	sphereKsOnKn  = 0.5;
+	sphereKsDivKn  = 0.5;
 	sphereFrictionDeg   = 18.0;
 	normalCohesion = 0;
 	shearCohesion = 0;
@@ -129,7 +129,7 @@
 	density			= 2600;
 	
 	boxYoungModulus   = 15000000.0;
-	boxKsOnKn  = 0.2;
+	boxKsDivKn  = 0.2;
 	boxFrictionDeg   = 0.f;
 	gravity 	= Vector3r(0,-9.81,0);
 	
@@ -310,13 +310,13 @@
    							2.0/5.0*body->state->mass*radius*radius);
 	body->state->se3			= Se3r(position,q);
 	physics->young			= sphereYoungModulus;
-	physics->poisson		= sphereKsOnKn;
+	physics->poisson		= sphereKsDivKn;
 	physics->frictionAngle		= sphereFrictionDeg * Mathr::PI/180.0;
 
 	if((!dynamic) && (!boxWalls))
 	{
 		physics->young			= boxYoungModulus;
-		physics->poisson		= boxKsOnKn;
+		physics->poisson		= boxKsDivKn;
 		physics->frictionAngle		= boxFrictionDeg * Mathr::PI/180.0;
 	}
 	
@@ -367,7 +367,7 @@
 	body->state->se3			= Se3r(position,q);
 
 	physics->young			= boxYoungModulus;
-	physics->poisson		= boxKsOnKn;
+	physics->poisson		= boxKsDivKn;
 	physics->frictionAngle		= boxFrictionDeg * Mathr::PI/180.0;
 
 	aabb->diffuseColor		= Vector3r(1,0,0);

=== modified file 'pkg/dem/PreProcessor/CohesiveTriaxialTest.hpp'
--- pkg/dem/PreProcessor/CohesiveTriaxialTest.hpp	2010-01-06 21:35:26 +0000
+++ pkg/dem/PreProcessor/CohesiveTriaxialTest.hpp	2010-01-07 16:13:54 +0000
@@ -35,12 +35,12 @@
 
 		Real		 thickness
 				,sphereYoungModulus
-				,sphereKsOnKn
+				,sphereKsDivKn
 				,sphereFrictionDeg
 				,normalCohesion
 				,shearCohesion
 				,boxYoungModulus
-				,boxKsOnKn
+				,boxKsDivKn
 				,boxFrictionDeg
 				,density
 				,dampingForce
@@ -133,14 +133,14 @@
 		(finalMaxMultiplier)
 
 		(sphereYoungModulus)
-		(sphereKsOnKn)
+		(sphereKsDivKn)
 		(sphereFrictionDeg)
 		(normalCohesion)
 		(shearCohesion)
 		(setCohesionOnNewContacts)
 
 		(boxYoungModulus)
-		(boxKsOnKn)
+		(boxKsDivKn)
 		(boxFrictionDeg)
 
 		(density)

=== modified file 'pkg/dem/PreProcessor/TriaxialTest.cpp'
--- pkg/dem/PreProcessor/TriaxialTest.cpp	2010-01-06 21:35:26 +0000
+++ pkg/dem/PreProcessor/TriaxialTest.cpp	2010-01-07 16:13:54 +0000
@@ -105,13 +105,13 @@
 	maxMultiplier 		= 1.01;
 	finalMaxMultiplier 	= 1.001;	
 	sphereYoungModulus  	= 15000000.0;
-	sphereKsOnKn  	= 0.5;	
+	sphereKsDivKn  	= 0.5;	
 	sphereFrictionDeg 	= 18.0;
 	compactionFrictionDeg   = sphereFrictionDeg;
 	density			= 2600;
 	
 	boxYoungModulus   	= 15000000.0;
-	boxKsOnKn  	= 0.2;
+	boxKsDivKn  	= 0.2;
 	boxFrictionDeg   	= 0.f;
 	gravity 		= Vector3r(0,-9.81,0);
 	
@@ -311,7 +311,7 @@
 	body->state->pos=position;
 	shared_ptr<GranularMat> mat(new GranularMat);
 	mat->young			= sphereYoungModulus;
-	mat->poisson		= sphereKsOnKn;
+	mat->poisson		= sphereKsDivKn;
 	mat->frictionAngle		= compactionFrictionDeg * Mathr::PI/180.0;
 	aabb->diffuseColor		= Vector3r(0,1,0);
 	iSphere->radius			= radius;
@@ -332,7 +332,7 @@
 	body->state->pos=position;
 	shared_ptr<GranularMat> mat(new GranularMat);
 	mat->young			= sphereYoungModulus;
-	mat->poisson		= sphereKsOnKn;
+	mat->poisson		= sphereKsDivKn;
 	mat->frictionAngle		= compactionFrictionDeg * Mathr::PI/180.0;
 	body->material=mat;
 	if(!facetWalls && !wallWalls){

=== modified file 'pkg/dem/PreProcessor/TriaxialTest.hpp'
--- pkg/dem/PreProcessor/TriaxialTest.hpp	2010-01-06 21:35:26 +0000
+++ pkg/dem/PreProcessor/TriaxialTest.hpp	2010-01-07 16:13:54 +0000
@@ -53,12 +53,12 @@
 
 		Real		 thickness
 				,sphereYoungModulus
-				,sphereKsOnKn
+				,sphereKsDivKn
 				,sphereFrictionDeg
 				//! If a different value of friction is to be used during the compaction phase
 				,compactionFrictionDeg
 				,boxYoungModulus
-				,boxKsOnKn
+				,boxKsDivKn
 				,boxFrictionDeg
 				,density
 				,dampingForce
@@ -165,11 +165,11 @@
 		(radiusStdDev)
 		(radiusMean)
 		(sphereYoungModulus)
-		(sphereKsOnKn)
+		(sphereKsDivKn)
 		(sphereFrictionDeg)
 		(compactionFrictionDeg)
 		(boxYoungModulus)
-		(boxKsOnKn)
+		(boxKsDivKn)
 		(boxFrictionDeg)
 		(density)
 		(defaultDt)

=== modified file 'pkg/dem/PreProcessor/TriaxialTestWater.cpp'
--- pkg/dem/PreProcessor/TriaxialTestWater.cpp	2010-01-06 21:35:26 +0000
+++ pkg/dem/PreProcessor/TriaxialTestWater.cpp	2010-01-07 16:13:54 +0000
@@ -124,13 +124,13 @@
 	finalMaxMultiplier = 1.001;
 	
 	sphereYoungModulus  = 5000000.0;
-	sphereKsOnKn  = 0.5;	
+	sphereKsDivKn  = 0.5;	
 	sphereFrictionDeg = 30.0;
 	compactionFrictionDeg   = sphereFrictionDeg;
 	density			= 2600;
 	
 	boxYoungModulus   = 5000000.0;
-	boxKsOnKn  = 0.2;
+	boxKsDivKn  = 0.2;
 	boxFrictionDeg   = 0.f;
 	gravity 	= Vector3r(0,-9.81,0);
 	
@@ -327,13 +327,13 @@
    2.0/5.0*body->state->mass*radius*radius);
 	body->state->se3			= Se3r(position,q);
 	physics->young			= sphereYoungModulus;
-	physics->poisson		= sphereKsOnKn;
+	physics->poisson		= sphereKsDivKn;
 	physics->frictionAngle		= sphereFrictionDeg * Mathr::PI/180.0;
 
 	if((!dynamic) && (!boxWalls))
 	{
 		physics->young			= boxYoungModulus;
-		physics->poisson		= boxKsOnKn;
+		physics->poisson		= boxKsDivKn;
 		physics->frictionAngle		= boxFrictionDeg * Mathr::PI/180.0;
 	}
 	
@@ -386,7 +386,7 @@
 	body->state->se3			= Se3r(position,q);
 
 	physics->young			= boxYoungModulus;
-	physics->poisson		= boxKsOnKn;
+	physics->poisson		= boxKsDivKn;
 	physics->frictionAngle		= boxFrictionDeg * Mathr::PI/180.0;
 
 	aabb->diffuseColor		= Vector3r(1,0,0);

=== modified file 'pkg/dem/PreProcessor/TriaxialTestWater.hpp'
--- pkg/dem/PreProcessor/TriaxialTestWater.hpp	2010-01-06 21:35:26 +0000
+++ pkg/dem/PreProcessor/TriaxialTestWater.hpp	2010-01-07 16:13:54 +0000
@@ -53,13 +53,13 @@
 
 		Real		 thickness
 				,sphereYoungModulus
-				,sphereKsOnKn
+				,sphereKsDivKn
 				,sphereFrictionDeg
 				//! If a different value of friction is to be used during the compaction phase
 				,compactionFrictionDeg
 				,Rdispersion
 				,boxYoungModulus
-				,boxKsOnKn
+				,boxKsDivKn
 				,boxFrictionDeg
 				,density
 				,dampingForce
@@ -150,11 +150,11 @@
 		(finalMaxMultiplier)
 
 		(sphereYoungModulus)
-		(sphereKsOnKn)
+		(sphereKsDivKn)
 		(sphereFrictionDeg)
 		(compactionFrictionDeg)
 		(boxYoungModulus)
-		(boxKsOnKn)
+		(boxKsDivKn)
 		(boxFrictionDeg)
 
 		(density)