[ViewVC] Diff of: OpenMD/branches/development/src/math/ConvexHull.cpp

Comparing trunk/src/math/ConvexHull.cpp (file contents):
Revision 1374 by chuckv, Tue Oct 20 20:05:28 2009 UTC vs.
Revision 1376 by gezelter, Tue Oct 20 20:36:56 2009 UTC

#	Line 44 \| Line 44
44		*
45		* Created by Charles F. Vardeman II on 11 Dec 2006.
46		* @author Charles F. Vardeman II
47	<	* @version $Id: ConvexHull.cpp,v 1.16 2009-10-20 20:05:28 chuckv Exp $
47	>	* @version $Id: ConvexHull.cpp,v 1.17 2009-10-20 20:36:56 gezelter Exp $
48		*
49		*/
50
#	Line 155 \| Line 155 \| *void ConvexHull::computeHull(std::vector<StuntDouble>**
155		masses.push_back(sd->getMass());
156		}
157
158	+
159	+
160		MPI::COMM_WORLD.Allgather(&localHullSites, 1, MPI::INT, &hullSitesOnProc[0],
161		1, MPI::INT);
162
163		int globalHullSites = 0;
164	<	for (int iproc = 0; i < nproc; iproc++){
164	>	for (int iproc = 0; iproc < nproc; iproc++){
165	>	std::cerr << "iproc = " << iproc << " sites = " << hullSitesOnProc[iproc] << "\n";
166		globalHullSites += hullSitesOnProc[iproc];
167		coordsOnProc[iproc] = dim_ * hullSitesOnProc[iproc];
168		}
#	Line 167 \| Line 170 \| *void ConvexHull::computeHull(std::vector<StuntDouble>**
170		displacements[0] = 0;
171		vectorDisplacements[0] = 0;
172
173	<	for (int iproc = 1; i < nproc; iproc++){
173	>	for (int iproc = 1; iproc < nproc; iproc++){
174		displacements[iproc] = displacements[iproc-1] + hullSitesOnProc[iproc-1];
175		vectorDisplacements[iproc] = vectorDisplacements[iproc-1] + coordsOnProc[iproc-1];
176		}

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines