yade-dev team mailing list archive

Thread
Date

[svn] r1808 - trunk/pkg/dem/Engine/EngineUnit

To: yade-dev@xxxxxxxxxxxxxxxxxxx
From: richefeu at BerliOS <richefeu@xxxxxxxxxxxxxxx>
Date: Tue, 23 Jun 2009 16:18:14 +0200

Author: richefeu
Date: 2009-06-23 16:18:13 +0200 (Tue, 23 Jun 2009)
New Revision: 1808

Modified:
   trunk/pkg/dem/Engine/EngineUnit/BasicViscoelasticRelationships.cpp
Log:
Ooops! There was a bug


Modified: trunk/pkg/dem/Engine/EngineUnit/BasicViscoelasticRelationships.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/BasicViscoelasticRelationships.cpp	2009-06-23 14:13:28 UTC (rev 1807)
+++ trunk/pkg/dem/Engine/EngineUnit/BasicViscoelasticRelationships.cpp	2009-06-23 14:18:13 UTC (rev 1808)
@@ -55,26 +55,28 @@
     {
         const shared_ptr<Body>& clump = (*((Omega::instance().getRootBody().get())->bodies))[ bdy1->clumpId ];
         RigidBodyParameters* clumpRBP=YADE_CAST<RigidBodyParameters*> ( clump->physicalParameters.get() );
-        m1 = clumpRBP->mass; 
+        m1 = clumpRBP->mass;
+        if (!clump->isDynamic) m1 *= 1.0e6;
     }
     else
-    { m1 = sdec1->mass ; }
+    {  
+        m1 = sdec1->mass ; 
+        if (!bdy1->isDynamic) m1 *= 1.0e6;
+    }
     
     if (bdy2->isClumpMember())
     {
         const shared_ptr<Body>& clump = (*((Omega::instance().getRootBody().get())->bodies))[ bdy2->clumpId ];
         RigidBodyParameters* clumpRBP=YADE_CAST<RigidBodyParameters*> ( clump->physicalParameters.get() );
         m2 = clumpRBP->mass;
+        if (!clump->isDynamic) m2 *= 1.0e6;
     }
     else
-    { m2 = sdec2->mass; }
+    { 
+        m2 = sdec2->mass; 
+        if (!bdy2->isDynamic) m2 *= 1.0e6;
+    }
 
-    if (!bdy1->isDynamic) m1 *= 1e6;
-    if (!bdy2->isDynamic) m2 *= 1e6;
-
-    //cout << "m1 = " << m1 << endl;
-    //cout << "m2 = " << m2 << endl;
-
     contactPhysics->cn *= 2.0 * sqrt(contactPhysics->kn * ((m1 * m2) / (m1 + m2)));
  
     contactPhysics->tangensOfFrictionAngle = std::tan(std::min(sdec1->frictionAngle, sdec2->frictionAngle));