yade-dev team mailing list archive

Thread
Date

[Branch ~yade-dev/yade/trunk] Rev 1802: 1. adapt VTKRecorder to body removing

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Fri, 20 Nov 2009 11:39:10 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 1802
committer: Sergei D. <sega@think>
branch nick: trunk
timestamp: Fri 2009-11-20 14:34:59 +0300
message:
  1. adapt VTKRecorder to body removing
  2. fix bug with colon separated paths in a profiles.
modified:
  SConstruct
  pkg/dem/Engine/StandAloneEngine/VTKRecorder.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 'SConstruct'
--- SConstruct	2009-11-20 09:08:07 +0000
+++ SConstruct	2009-11-20 11:34:59 +0000
@@ -145,7 +145,7 @@
 	EnumVariable('linkStrategy','How to link plugins together','per-class',['per-class','per-pkg[broken]','monolithic','static[broken]']),
 	('version','Yade version (if not specified, guess will be attempted)',None),
 	('CPPPATH', 'Additional paths for the C preprocessor (colon-separated)',None),
-	('LIBPATH','Additional paths for the linker (colon-separated)',None,None,colonSplit),
+	('LIBPATH','Additional paths for the linker (colon-separated)',None),
 	('QTDIR','Directories where to look for qt3',['/usr/share/qt3','/usr/lib/qt','/usr/lib/qt3','/usr/qt/3','/usr/lib/qt-3.3'],None,colonSplit),
 	('PATH','Path (not imported automatically from the shell) (colon-separated)',None,None,colonSplit),
 	('CXX','The c++ compiler','g++'),
@@ -161,7 +161,9 @@
 opts.Update(env)
 opts.Save(optsFile,env)
 if env.has_key('CPPPATH'):
-	env['CPPPATH']=colonSplit(env['CPPPATH'])
+	env['CPPPATH']=colonSplit(env['CPPPATH'][0])
+if env.has_key('LIBPATH'):
+	env['LIBPATH']=colonSplit(env['LIBPATH'][0])
 
 # do not propagate PATH from outside, to ensure identical builds on different machines
 #env.Append(ENV={'PATH':['/usr/local/bin','/bin','/usr/bin']})

=== modified file 'pkg/dem/Engine/StandAloneEngine/VTKRecorder.cpp'
--- pkg/dem/Engine/StandAloneEngine/VTKRecorder.cpp	2009-11-17 12:26:35 +0000
+++ pkg/dem/Engine/StandAloneEngine/VTKRecorder.cpp	2009-11-20 11:34:59 +0000
@@ -127,6 +127,8 @@
 	}
 
 	FOREACH(const shared_ptr<Body>& b, *rootBody->bodies){
+		if (!b) continue;
+
 		if (recActive[REC_SPHERES])
 		{
 			const InteractingSphere* sphere = dynamic_cast<InteractingSphere*>(b->interactingGeometry.get());