yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2520
committer: Sergei D. <sega@think>
branch nick: trunk
timestamp: Thu 2010-10-28 17:28:07 +0400
message:
  Fix bug in Ip2_ViscElMat_ViscElMat_ViscElPhys
modified:
  pkg/dem/ViscoelasticPM.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/ViscoelasticPM.cpp'
--- pkg/dem/ViscoelasticPM.cpp	2010-10-27 18:54:33 +0000
+++ pkg/dem/ViscoelasticPM.cpp	2010-10-28 13:28:07 +0000
@@ -26,10 +26,10 @@
 	const Real kn2 = mat2->kn*mass2; const Real cn2 = mat2->cn*mass2;
 	const Real ks2 = mat2->ks*mass2; const Real cs2 = mat2->cs*mass2;
 	ViscElPhys* phys = new ViscElPhys();
-	phys->kn = 1/(kn1?1/kn1:0 + kn2?1/kn2:0);
-	phys->ks = 1/(ks1?1/ks1:0 + ks2?1/ks2:0);
-	phys->cn = cn1?1/cn1:0 + cn2?1/cn2:0; phys->cn = phys->cn?1/phys->cn:0;
-	phys->cs = cs1?1/cs1:0 + cs2?1/cs2:0; phys->cs = phys->cs?1/phys->cs:0;
+	phys->kn = 1/( (kn1?1/kn1:0) + (kn2?1/kn2:0) );
+	phys->ks = 1/( (ks1?1/ks1:0) + (ks2?1/ks2:0) );
+	phys->cn = (cn1?1/cn1:0) + (cn2?1/cn2:0); phys->cn = phys->cn?1/phys->cn:0;
+	phys->cs = (cs1?1/cs1:0) + (cs2?1/cs2:0); phys->cs = phys->cs?1/phys->cs:0;
 	phys->tangensOfFrictionAngle = std::tan(std::min(mat1->frictionAngle, mat2->frictionAngle)); 
 	phys->shearForce = Vector3r(0,0,0);
 	phys->prevNormal = Vector3r(0,0,0);