yade-dev team mailing list archive

Thread
Date

[Branch ~yade-dev/yade/trunk] Rev 2269: Scene.hpp -> remove obsolete comment

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 02 Jun 2010 23:34:13 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 2269
committer: Janek Kozicki <cosurgi@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-06-03 01:31:35 +0200
message:
  Scene.hpp -> remove obsolete comment
  QtGUIGenerator -> wider view on vector fields
  TriaxialStateRecorder and TriaxialCompressionEngine -> it was segfaulting with clumps: fix it.
  
  modified:
    core/Scene.hpp
    lib/serialization-qt/QtGUIGenerator.cpp
    pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp
    pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp
    py/pack/_packPredicates.cpp
modified:
  core/Scene.hpp
  lib/serialization-qt/QtGUIGenerator.cpp
  pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp
  pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp
  py/pack/_packPredicates.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/Scene.hpp'
--- core/Scene.hpp	2010-05-13 20:19:38 +0000
+++ core/Scene.hpp	2010-06-02 23:31:35 +0000
@@ -32,7 +32,7 @@
 		shared_ptr<Bound> bound;
 		shared_ptr<BodyContainer>		bodies;
 		vector<shared_ptr<Engine> >		engines;
-		vector<shared_ptr<Engine> >		initializers; // FIXME: see MovingSupport:50
+		vector<shared_ptr<Engine> >		initializers;
 		shared_ptr<InteractionContainer> interactions;
 		//! Container of shared materials. Add elements using Scene::addMaterial, not directly. Do NOT remove elements from here unless you know what you are doing!
 		vector<shared_ptr<Material> > materials;

=== modified file 'lib/serialization-qt/QtGUIGenerator.cpp'
--- lib/serialization-qt/QtGUIGenerator.cpp	2009-12-04 21:56:59 +0000
+++ lib/serialization-qt/QtGUIGenerator.cpp	2010-06-02 23:31:35 +0000
@@ -64,7 +64,7 @@
 void QtGUIGenerator::reArrange(QWidget * widget)
 {	
 	if (resizeWidth)
-		widgetWidth = 400;
+		widgetWidth = 500;
 	else
 		widgetWidth = widget->size().width();
 

=== modified file 'pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp'
--- pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp	2010-05-13 20:19:38 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp	2010-06-02 23:31:35 +0000
@@ -238,6 +238,7 @@
 	scene = Omega::instance().getScene().get();
 	shared_ptr<BodyContainer>& bodies = scene->bodies;
 	FOREACH(const shared_ptr<Body>& b,*scene->bodies){
+		if(b->isClump()) continue;
 		if (b->isDynamic)
 		YADE_PTR_CAST<FrictMat> (b->material)->frictionAngle = frictionDegree * Mathr::PI/180.0;
 	}

=== modified file 'pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp'
--- pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp	2010-05-08 20:24:44 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp	2010-06-02 23:31:35 +0000
@@ -48,6 +48,7 @@
 	BodyContainer::iterator bi = scene->bodies->begin();
 	BodyContainer::iterator biEnd = scene->bodies->end();
 	for ( ; bi!=biEnd; ++bi ){
+		if((*bi)->isClump()) continue;
 		const shared_ptr<Body>& b = *bi;
 		if ( b->isDynamic ){
 			//Sorry, the next string was commented, because it gave a Warning "unused variable v". Anton Gladky

=== modified file 'py/pack/_packPredicates.cpp'
--- py/pack/_packPredicates.cpp	2010-05-08 20:24:44 +0000
+++ py/pack/_packPredicates.cpp	2010-06-02 23:31:35 +0000
@@ -279,7 +279,7 @@
 }
 
 /*
-This class plays tricks getting aroung pyGTS to get GTS objects and cache bb tree to speed
+This class plays tricks getting around pyGTS to get GTS objects and cache bb tree to speed
 up point inclusion tests. For this reason, we have to link with _gts.so (see corresponding
 SConscript file), which is at the same time the python module.
 */