yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #10124
[Branch ~yade-pkg/yade/git-trunk] Rev 3708: Rename variables in LudingPM (Theta->Delta).
------------------------------------------------------------
revno: 3708
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Fri 2013-10-11 16:42:51 +0200
message:
Rename variables in LudingPM (Theta->Delta).
modified:
pkg/dem/LudingPM.cpp
pkg/dem/LudingPM.hpp
--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'pkg/dem/LudingPM.cpp'
--- pkg/dem/LudingPM.cpp 2013-10-11 14:36:27 +0000
+++ pkg/dem/LudingPM.cpp 2013-10-11 14:42:51 +0000
@@ -56,13 +56,13 @@
phys->tangensOfFrictionAngle = std::tan(std::min(mat1->frictionAngle, mat2->frictionAngle));
phys->shearForce = Vector3r(0,0,0);
- phys->ThetMax = 0.0;
- phys->ThetNull = 0.0;
- phys->ThetPMax = phys->kp/(phys->kp-phys->k1)*phys->PhiF*2*a1*a2/(a1+a2); // [Luding2008], equation (7)
+ phys->DeltMax = 0.0;
+ phys->DeltNull = 0.0;
+ phys->DeltPMax = phys->kp/(phys->kp-phys->k1)*phys->PhiF*2*a1*a2/(a1+a2); // [Luding2008], equation (7)
// [Singh2013], equation (11)
- phys->ThetPNull = phys->PhiF*2*a1*a2/(a1+a2); // [Singh2013], equation (12)
- phys->ThetaPrev = 0.0;
- phys->ThetaMin = 0.0;
+ phys->DeltPNull = phys->PhiF*2*a1*a2/(a1+a2); // [Singh2013], equation (12)
+ phys->DeltPrev = 0.0;
+ phys->DeltMin = 0.0;
interaction->phys = shared_ptr<LudingPhys>(phys);
}
@@ -79,9 +79,9 @@
const int id1 = I->getId1();
const int id2 = I->getId2();
- const Real Theta = geom.penetrationDepth;
+ const Real Delt = geom.penetrationDepth;
- if (Theta<0) {
+ if (Delt<0) {
scene->interactions->requestErase(I);
return;
};
@@ -91,11 +91,11 @@
Real forceHys = 0.0;
- if (phys.ThetMax/phys.ThetPMax >= 1.0) { // [Luding2008], equation (8)
+ if (phys.DeltMax/phys.DeltPMax >= 1.0) { // [Luding2008], equation (8)
phys.k2 = phys.kp; // [Singh2013], equation (10)
}
- phys.k2 = phys.k1 + (phys.kp - phys.k1)*phys.ThetMax/phys.ThetPMax;
+ phys.k2 = phys.k1 + (phys.kp - phys.k1)*phys.DeltMax/phys.DeltPMax;
if (phys.k2>phys.kp) {
@@ -106,39 +106,38 @@
phys.k1 = phys.k2;
}
- phys.ThetaMin = (phys.k2- phys.k1)/(phys.k2 + phys.kc);
+ phys.DeltMin = (phys.k2- phys.k1)/(phys.k2 + phys.kc);
- if (Theta > phys.ThetMax) {
- phys.ThetMax = Theta;
- phys.ThetNull = std::min((1.0 - phys.k1/phys.k2)*phys.ThetMax, phys.ThetPNull); // [Luding2008], equation over Fig 1
+ if (Delt > phys.DeltMax) {
+ phys.DeltMax = Delt;
+ phys.DeltNull = std::min((1.0 - phys.k1/phys.k2)*phys.DeltMax, phys.DeltPNull); // [Luding2008], equation over Fig 1
// [Singh2013], equation (8)
}
- Real k2DeltaTtmp = phys.k2*(Theta - phys.ThetNull);
- // [Luding2008], equation (6)
+ Real k2DeltTtmp = phys.k2*(Delt - phys.DeltNull); // [Luding2008], equation (6)
// [Singh2013], equation (6)
- if ( k2DeltaTtmp >= phys.k1*Theta) {
- if (Theta<phys.ThetPMax){
- forceHys = phys.k1*Theta;
+ if ( k2DeltTtmp >= phys.k1*Delt) {
+ if (Delt<phys.DeltPMax){
+ forceHys = phys.k1*Delt;
} else {
- forceHys = k2DeltaTtmp;
+ forceHys = k2DeltTtmp;
}
- } else if (k2DeltaTtmp > -phys.kc*Theta and k2DeltaTtmp < phys.k1*Theta) {
- forceHys = k2DeltaTtmp;
- } else if (k2DeltaTtmp<=-phys.kc*Theta) {
- if ((Theta - phys.ThetaPrev) < 0) {
- forceHys = -phys.kc*Theta;
- phys.ThetMax = Theta*(phys.k2 + phys.kc)/(phys.k2 - phys.k1); // [Singh2013], equation (9)
- phys.ThetNull = std::min((1.0 - phys.k1/phys.k2)*phys.ThetMax, phys.ThetPNull); // [Luding2008], equation over Fig 1
+ } else if (k2DeltTtmp > -phys.kc*Delt and k2DeltTtmp < phys.k1*Delt) {
+ forceHys = k2DeltTtmp;
+ } else if (k2DeltTtmp<=-phys.kc*Delt) {
+ if ((Delt - phys.DeltPrev) < 0) {
+ forceHys = -phys.kc*Delt;
+ phys.DeltMax = Delt*(phys.k2 + phys.kc)/(phys.k2 - phys.k1); // [Singh2013], equation (9)
+ phys.DeltNull = std::min((1.0 - phys.k1/phys.k2)*phys.DeltMax, phys.DeltPNull); // [Luding2008], equation over Fig 1
// [Singh2013], equation (8)
} else {
- forceHys = k2DeltaTtmp;
+ forceHys = k2DeltTtmp;
}
}
- phys.ThetaPrev = Theta;
+ phys.DeltPrev = Delt;
//===================================================================
//===================================================================
=== modified file 'pkg/dem/LudingPM.hpp'
--- pkg/dem/LudingPM.hpp 2013-10-11 14:36:27 +0000
+++ pkg/dem/LudingPM.hpp 2013-10-11 14:42:51 +0000
@@ -32,12 +32,12 @@
((Real,kp,NaN,,"Slope of unloading and reloading limit elastic branch"))
((Real,kc,NaN,,"Slope of irreversible, tensile adhesive branch"))
((Real,PhiF,NaN,,"Dimensionless plasticity depth"))
- ((Real,ThetMax,NaN,,"Maximum overlap between particles for a collision"))
- ((Real,ThetPMax,NaN,,"Maximum overlap between particles for the limit case"))
- ((Real,ThetNull,NaN,,"Force free overlap, plastic contact deformation"))
- ((Real,ThetPNull,NaN,,"Max force free overlap, plastic contact deformation"))
- ((Real,ThetaPrev,NaN,,"Previous value of delta"))
- ((Real,ThetaMin,NaN,,"MinimalTheta value of delta"))
+ ((Real,DeltMin,NaN,,"MinimalDelta value of delta"))
+ ((Real,DeltMax,NaN,,"Maximum overlap between particles for a collision"))
+ ((Real,DeltPMax,NaN,,"Maximum overlap between particles for the limit case"))
+ ((Real,DeltNull,NaN,,"Force free overlap, plastic contact deformation"))
+ ((Real,DeltPNull,NaN,,"Max force free overlap, plastic contact deformation"))
+ ((Real,DeltPrev,NaN,,"Previous value of delta"))
((Real,G0,NaN,,"Viscous damping")),
createIndex();
)
