yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2585
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Fri 2010-12-03 00:02:49 +0100
message:
  1. Fix bug in VTKRecorder (Thanks, Vaclav) 
  2. Cohesive-chain test disabled (please, fix it, who can...), https://yade-dem.org/buildbot/builders/yade-full/builds/127
modified:
  pkg/dem/VTKRecorder.cpp
  py/tests/__init__.py


--
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/VTKRecorder.cpp'
--- pkg/dem/VTKRecorder.cpp	2010-11-19 12:30:08 +0000
+++ pkg/dem/VTKRecorder.cpp	2010-12-02 23:02:49 +0000
@@ -201,6 +201,8 @@
 		FOREACH(const shared_ptr<Interaction>& I, *scene->interactions){
 			if(!I->isReal()) continue;
 			if(skipFacetIntr){
+				if(!(Body::byId(I->getId1()))) continue;
+				if(!(Body::byId(I->getId2()))) continue;
 				if(!(dynamic_cast<Sphere*>(Body::byId(I->getId1())->shape.get()))) continue;
 				if(!(dynamic_cast<Sphere*>(Body::byId(I->getId2())->shape.get()))) continue;
 			}

=== modified file 'py/tests/__init__.py'
--- py/tests/__init__.py	2010-11-19 15:29:34 +0000
+++ py/tests/__init__.py	2010-12-02 23:02:49 +0000
@@ -4,7 +4,8 @@
 import unittest,inspect
 
 # add any new test suites to the list here, so that they are picked up by testAll
-allTests=['wrapper','omega','pbc','clump','cohesive-chain']
+allTests=['wrapper','omega','pbc','clump']
+#allTests=['wrapper','omega','pbc','clump','cohesive-chain'] #Cohesive chain disabled because of instability. Anton.`
 
 # all yade modules (ugly...)
 import yade.eudoxos,yade.export,yade.linterpolation,yade.log,yade.pack,yade.plot,yade.post2d,yade.timing,yade.utils,yade.ymport