yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2671
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
branch nick: yade
timestamp: Fri 2011-01-21 21:42:22 +0100
message:
  - one file left behind in last commit, sorry.
modified:
  pkg/common/Dispatching.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 'pkg/common/Dispatching.cpp'
--- pkg/common/Dispatching.cpp	2010-12-13 12:11:43 +0000
+++ pkg/common/Dispatching.cpp	2011-01-21 20:42:22 +0000
@@ -65,7 +65,7 @@
 		//throw logic_error("IGeomDispatcher::explicitAction does not support periodic boundary conditions (O.periodic==True)");
 		for(int i=0; i<3; i++) cellDist[i]=-(int)((b2->state->pos[i]-b1->state->pos[i])/scene->cell->getSize()[i]+.5);
 	}
-	Vector3r shift2=scene->cell->Hsize*cellDist.cast<Real>();
+	Vector3r shift2=scene->cell->hSize*cellDist.cast<Real>();
 	updateScenePtr();
 	if(force){
 		assert(b1->shape && b2->shape);
@@ -99,7 +99,7 @@
 
 	shared_ptr<BodyContainer>& bodies = scene->bodies;
 	const bool isPeriodic(scene->isPeriodic);
-	Matrix3r cellHsize; if(isPeriodic) cellHsize=scene->cell->Hsize;
+	Matrix3r cellHsize; if(isPeriodic) cellHsize=scene->cell->hSize;
 	bool removeUnseenIntrs=(scene->interactions->iterColliderLastRun>=0 && scene->interactions->iterColliderLastRun==scene->iter);
 	#ifdef YADE_OPENMP
 		const long size=scene->interactions->size();