--- trunk/src/math/ConvexHull.cpp	2009/10/20 20:36:56	1376
+++ trunk/src/math/ConvexHull.cpp	2009/10/21 15:48:12	1378
@@ -44,7 +44,7 @@
  *
  *  Created by Charles F. Vardeman II on 11 Dec 2006.
  *  @author  Charles F. Vardeman II
- *  @version $Id: ConvexHull.cpp,v 1.17 2009-10-20 20:36:56 gezelter Exp $
+ *  @version $Id: ConvexHull.cpp,v 1.19 2009-10-21 15:48:12 gezelter Exp $
  *
  */
 
@@ -94,8 +94,7 @@ void ConvexHull::computeHull(std::vector<StuntDouble*>
   setT *vertices;
   int curlong, totlong;
   
-  std::vector<double> ptArray(numpoints*3);
-  std::vector<bool> isSurfaceID(numpoints); 
+  std::vector<double> ptArray(numpoints*dim_);
 
   // Copy the positon vector into a points vector for qhull.
   std::vector<StuntDouble*>::iterator SD;
@@ -134,13 +133,16 @@ void ConvexHull::computeHull(std::vector<StuntDouble*>
 
   std::vector<double> coords;
   std::vector<double> vels;
-  std::vector<int> objectIDs;
+  std::vector<int> indexMap;
   std::vector<double> masses;
 
   FORALLvertices{
     localHullSites++;
     
     int idx = qh_pointid(vertex->point);
+
+    indexMap.push_back(idx);
+
     coords.push_back(ptArray[dim_  * idx]);
     coords.push_back(ptArray[dim_  * idx + 1]);
     coords.push_back(ptArray[dim_  * idx + 2]);
@@ -155,14 +157,11 @@ void ConvexHull::computeHull(std::vector<StuntDouble*>
     masses.push_back(sd->getMass());
   }
 
-
-
   MPI::COMM_WORLD.Allgather(&localHullSites, 1, MPI::INT, &hullSitesOnProc[0],
                             1, MPI::INT);
 
   int globalHullSites = 0;
   for (int iproc = 0; iproc < nproc; iproc++){
-    std::cerr << "iproc = " << iproc << " sites = " << hullSitesOnProc[iproc] << "\n";
     globalHullSites += hullSitesOnProc[iproc];
     coordsOnProc[iproc] = dim_ * hullSitesOnProc[iproc];
   }
@@ -175,22 +174,23 @@ void ConvexHull::computeHull(std::vector<StuntDouble*>
     vectorDisplacements[iproc] = vectorDisplacements[iproc-1] + coordsOnProc[iproc-1]; 
   }
 
-  std::vector<double> globalCoords(dim_*globalHullSites);
-  std::vector<double> globalVels(dim_*globalHullSites);
+  std::vector<double> globalCoords(dim_ * globalHullSites);
+  std::vector<double> globalVels(dim_ * globalHullSites);
   std::vector<double> globalMasses(globalHullSites);
+
   int count = coordsOnProc[myrank];
   
-  MPI::COMM_WORLD.Allgatherv(&coords[0], count, MPI::DOUBLE,
-                             &globalCoords[0], &coordsOnProc[0], &vectorDisplacements[0],
+  MPI::COMM_WORLD.Allgatherv(&coords[0], count, MPI::DOUBLE, &globalCoords[0],
+                             &coordsOnProc[0], &vectorDisplacements[0], 
                              MPI::DOUBLE);
 
-  MPI::COMM_WORLD.Allgatherv(&vels[0], count, MPI::DOUBLE,
-                             &globalVels[0], &coordsOnProc[0], &vectorDisplacements[0],
+  MPI::COMM_WORLD.Allgatherv(&vels[0], count, MPI::DOUBLE, &globalVels[0], 
+                             &coordsOnProc[0], &vectorDisplacements[0],
                              MPI::DOUBLE);
 
   MPI::COMM_WORLD.Allgatherv(&masses[0], localHullSites, MPI::DOUBLE,
-                             &globalMasses[0], &hullSitesOnProc[0], &displacements[0],
-                             MPI::DOUBLE);
+                             &globalMasses[0], &hullSitesOnProc[0], 
+                             &displacements[0], MPI::DOUBLE);
 
   // Free previous hull
   qh_freeqhull(!qh_ALL);
@@ -228,6 +228,7 @@ void ConvexHull::computeHull(std::vector<StuntDouble*>
     Vector3d faceVel = V3Zero;
     Vector3d p[3];
     RealType faceMass = 0.0;
+
     int ver = 0;
 
     FOREACHvertex_(vertices){
@@ -245,12 +246,14 @@ void ConvexHull::computeHull(std::vector<StuntDouble*>
                      globalVels[dim_ * id + 2]);
       mass = globalMasses[id];
 
-      // localID will be between 0 and hullSitesOnProc[myrank] if we own this guy.
+      // localID will be between 0 and hullSitesOnProc[myrank] if we
+      // own this guy.
+
       int localID = id - displacements[myrank];
-      if (id >= 0 && id < hullSitesOnProc[myrank])
-        face.addVertexSD(bodydoubles[localID]);
-      else
-        face.addVertexSD(NULL);
+
+      if (localID >= 0 && localID < hullSitesOnProc[myrank])
+        face.addVertexSD(bodydoubles[indexMap[localID]]);
+      
 #else
       vel = bodydoubles[id]->getVel();
       mass = bodydoubles[id]->getMass();
@@ -288,8 +291,6 @@ void ConvexHull::computeHull(std::vector<StuntDouble*>
               << totlong << curlong << std::endl;    
 }
 
-
-
 void ConvexHull::printHull(const std::string& geomFileName) {
   FILE *newGeomFile;