yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1730
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2009-08-24 16:59:16 +0200
message:
  1. 418107, I guess it is more correctly.
modified:
  core/InteractionContainer.cpp
  pkg/dem/meta/RockPM.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 'core/InteractionContainer.cpp'
--- core/InteractionContainer.cpp	2009-08-24 14:46:05 +0000
+++ core/InteractionContainer.cpp	2009-08-24 14:59:16 +0000
@@ -25,8 +25,10 @@
 		FOREACH(list<bodyIdPair>& pendingErase, threadsPendingErase){
 			pendingErase.clear();
 		}
+	#else
+		pendingErase.clear();
 	#endif
-	pendingErase.clear();
+	
 }
 
 int InteractionContainer::unconditionalErasePending(){

=== modified file 'pkg/dem/meta/RockPM.cpp'
--- pkg/dem/meta/RockPM.cpp	2009-08-06 07:40:14 +0000
+++ pkg/dem/meta/RockPM.cpp	2009-08-24 14:59:16 +0000
@@ -96,9 +96,7 @@
 		if (phys->isCohesive) {
 			if (displN>(phys->lengthMaxTension)) {
 				//LOG_WARN(displN<<"__TENSION!!!__");
-				phys->isCohesive = false;
-				rbp1->isDamaged=true;
-				rbp2->isDamaged=true;
+				rootBody->interactions->requestErase(contact->getId1(),contact->getId2());
 				return; 
 			} else {
 				phys->normalForce=phys->kn*displN*geom->normal;