yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3807
committer: Jerome Duriez <jerome.duriez@xxxxxxxxxxxxxxx>
timestamp: Wed 2014-01-29 12:27:31 +0100
message:
  Use of correct version of requestErase() in JCFpm (https://bugs.launchpad.net/yade/+bug/1273775)
modified:
  pkg/dem/JointedCohesiveFrictionalPM.cpp


--
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/JointedCohesiveFrictionalPM.cpp'
--- pkg/dem/JointedCohesiveFrictionalPM.cpp	2013-11-05 10:52:25 +0000
+++ pkg/dem/JointedCohesiveFrictionalPM.cpp	2014-01-29 11:27:31 +0000
@@ -42,7 +42,7 @@
 	
 	if ( smoothJoint && phys->isOnJoint ) {
 	  if ( phys->more || ( phys->jointCumulativeSliding > (2*min(geom->radius1,geom->radius2)) ) ) { 
-	    scene->interactions->requestErase(contact->getId1(),contact->getId2()); return; 
+	    scene->interactions->requestErase(contact); return; 
 	    } else { 
 	    D = phys->initD - abs((b1->state->pos - b2->state->pos).dot(phys->jointNormal)); 
 	    }
@@ -52,7 +52,7 @@
 
 	/* Determination of interaction */
 	if (D < 0) { //spheres do not touch 
-	  if ( !phys->isCohesive ) { scene->interactions->requestErase(contact->getId1(),contact->getId2()); return; }
+	  if ( !phys->isCohesive ) { scene->interactions->requestErase(contact); return; }
 	  
 	  if ( phys->isCohesive && (phys->FnMax>0) && (abs(D)>Dtensile) ) {
 	    
@@ -75,7 +75,7 @@
 	    cracksFileExist=true;
 
 	    // delete contact
-	    scene->interactions->requestErase(contact->getId1(),contact->getId2()); return;
+	    scene->interactions->requestErase(contact); return;
 	  }
 	}	  
 	
@@ -136,7 +136,7 @@
 	    
 	    // delete contact if in tension, set the contact properties to friction if in compression
 	    if ( D < 0 ) {
-	      scene->interactions->requestErase(contact->getId1(),contact->getId2()); return;
+	      scene->interactions->requestErase(contact); return;
 	    } else {
 	      phys->FnMax = 0;
 	      phys->FsMax = 0;