yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3842
committer: Francois <francois.kneib@xxxxxxxxx>
timestamp: Thu 2016-04-14 13:01:04 +0200
message:
  Simplify one line in TesselationWrapper.
modified:
  pkg/dem/TesselationWrapper.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/TesselationWrapper.cpp'
--- pkg/dem/TesselationWrapper.cpp	2016-04-11 09:50:55 +0000
+++ pkg/dem/TesselationWrapper.cpp	2016-04-14 11:01:04 +0000
@@ -75,8 +75,8 @@
 		if ( (*bi)->shape->getClassIndex() ==  Sph_Index ) {
 			const Sphere* s = YADE_CAST<Sphere*> ((*bi)->shape.get());
 //FIXME: is the scene periodicity verification useful in the next line ? Tesselation seems to work in both periodic and non-periodic conditions with "scene->cell->wrapShearedPt((*bi)->state->pos)". I keep the verification to be consistent with all other uses of "wrapShearedPt" function.
-			const Vector3r& pos = Omega::instance().getScene().get()->isPeriodic	? scene->cell->wrapShearedPt((*bi)->state->pos)
-												: (*bi)->state->pos;
+			const Vector3r& pos = scene->isPeriodic	? scene->cell->wrapShearedPt((*bi)->state->pos)
+								: (*bi)->state->pos;
 			const Real rad = s->radius;
 			CGT::Sphere sp(CGT::Point(pos[0],pos[1],pos[2]),rad*rad);
 			spheres.push_back(sp);