yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2298
committer: Chiara Modenese <chia@engs-018373>
branch nick: trunk
timestamp: Mon 2010-06-21 18:31:31 +0100
message:
  Rename rotateShear() to rotate() in ScGeom.
modified:
  pkg/dem/DataClass/InteractionGeometry/ScGeom.cpp*
  pkg/dem/DataClass/InteractionGeometry/ScGeom.hpp*
  pkg/dem/Engine/GlobalEngine/HertzMindlin.cpp*
  pkg/dem/Engine/GlobalEngine/HertzMindlin.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/DataClass/InteractionGeometry/ScGeom.cpp' (properties changed: +x to -x)
--- pkg/dem/DataClass/InteractionGeometry/ScGeom.cpp	2010-06-21 15:55:15 +0000
+++ pkg/dem/DataClass/InteractionGeometry/ScGeom.cpp	2010-06-21 17:31:31 +0000
@@ -130,7 +130,7 @@
 	return shearDisplacement;
 }
 
-Vector3r ScGeom::rotateShear(Vector3r& shearForce, const Vector3r& prevNormal, const State* rbp1, const State* rbp2, Real dt){
+Vector3r ScGeom::rotate(Vector3r& shearForce, const Vector3r& prevNormal, const State* rbp1, const State* rbp2, Real dt){
 	Vector3r axis;
 	Real angle;
 	// approximated rotations

=== modified file 'pkg/dem/DataClass/InteractionGeometry/ScGeom.hpp' (properties changed: +x to -x)
--- pkg/dem/DataClass/InteractionGeometry/ScGeom.hpp	2010-06-21 15:55:15 +0000
+++ pkg/dem/DataClass/InteractionGeometry/ScGeom.hpp	2010-06-21 17:31:31 +0000
@@ -29,8 +29,8 @@
 		//!  Periodic variant. Needs the velocity shift across periods for periodic BCs (else it is safe to pass Vector3r::Zero()). Typically obtained as scene->cell->velGrad*scene->cell->Hsize*cellDist. It would be better to define the shift transparently inside the function, but it needs scene and interaction pointers, which we don't have here.
 		Vector3r rotateAndGetShear(Vector3r& shearForce, const Vector3r& prevNormal, const State* rbp1, const State* rbp2, Real dt, const Vector3r& shiftVel, bool avoidGranularRatcheting=true);
 
-		// Add method which only rotates the shear vector.
-		Vector3r rotateShear(Vector3r& shearForce, const Vector3r& prevNormal, const State* rbp1, const State* rbp2, Real dt);
+		// Add method which only rotates the shear vector (or another vector as well).
+		Vector3r rotate(Vector3r& shearForce, const Vector3r& prevNormal, const State* rbp1, const State* rbp2, Real dt);
 		// Add method which returns the impact velocity (then, inside the contact law, this can be split into shear and normal component). Handle periodicity.
 		Vector3r getIncidentVel(const State* rbp1, const State* rbp2, Real dt, const Vector3r& shiftVel, bool avoidGranularRatcheting=true);
 		// Implement another version of getIncidentVel which does not handle periodicity.

=== modified file 'pkg/dem/Engine/GlobalEngine/HertzMindlin.cpp' (properties changed: +x to -x)
--- pkg/dem/Engine/GlobalEngine/HertzMindlin.cpp	2010-06-21 15:55:15 +0000
+++ pkg/dem/Engine/GlobalEngine/HertzMindlin.cpp	2010-06-21 17:31:31 +0000
@@ -112,7 +112,7 @@
 	// Define shift to handle periodicity
 	Vector3r shiftVel = scene->isPeriodic ? (Vector3r)((scene->cell->velGrad*scene->cell->Hsize)*Vector3r((Real) contact->cellDist[0],(Real) contact->cellDist[1],(Real) contact->cellDist[2])) : Vector3r::Zero();
 	// 1. Rotate shear force
-	shearElastic = scg->rotateShear(shearElastic, phys->prevNormal, de1, de2, dt);
+	shearElastic = scg->rotate(shearElastic, phys->prevNormal, de1, de2, dt);
 	// 2. Get incident velocity, get shear and normal components
 	// FIXME: Concerning the possibility to avoid granular ratcheting, it is not clear how this works in the case of HM. See the thread http://www.mail-archive.com/yade-users@xxxxxxxxxxxxxxxxxxx/msg01947.html
 	Vector3r incidentV = scg->getIncidentVel(de1, de2, dt, shiftVel, preventGranularRatcheting);	

=== modified file 'pkg/dem/Engine/GlobalEngine/HertzMindlin.hpp' (properties changed: +x to -x)