--- trunk/src/math/ConvexHull.cpp 2009/10/22 19:12:14 1383 +++ trunk/src/math/ConvexHull.cpp 2009/10/22 19:43:10 1384 @@ -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.19 2009-10-21 15:48:12 gezelter Exp $ + * @version $Id: ConvexHull.cpp,v 1.20 2009-10-22 19:43:10 gezelter Exp $ * */ @@ -77,9 +77,6 @@ extern "C" #include } -/* Old options Qt Qu Qg QG0 FA */ -/* More old opts Qc Qi Pp*/ - ConvexHull::ConvexHull() : Hull(), dim_(3), options_("qhull Qt Pp") { } @@ -126,10 +123,11 @@ void ConvexHull::computeHull(std::vector int nproc = MPI::COMM_WORLD.Get_size(); int myrank = MPI::COMM_WORLD.Get_rank(); int localHullSites = 0; - int* hullSitesOnProc = new int[nproc]; - int* coordsOnProc = new int[nproc]; - int* displacements = new int[nproc]; - int* vectorDisplacements = new int[nproc]; + + std::vector hullSitesOnProc(nproc, 0); + std::vector coordsOnProc(nproc, 0); + std::vector displacements(nproc, 0); + std::vector vectorDisplacements(nproc, 0); std::vector coords; std::vector vels; @@ -277,13 +275,6 @@ void ConvexHull::computeHull(std::vector volume_ = qh totvol; area_ = qh totarea; -#ifdef IS_MPI - delete [] hullSitesOnProc; - delete [] coordsOnProc; - delete [] displacements; - delete [] vectorDisplacements; -#endif - qh_freeqhull(!qh_ALL); qh_memfreeshort(&curlong, &totlong); if (curlong || totlong) @@ -292,6 +283,10 @@ void ConvexHull::printHull(const std::string& geomFile } void ConvexHull::printHull(const std::string& geomFileName) { + +#ifdef IS_MPI + if (worldRank == 0) { +#endif FILE *newGeomFile; //create new .md file based on old .md file @@ -301,5 +296,8 @@ void ConvexHull::printHull(const std::string& geomFile qh_printfacets(newGeomFile, qh PRINTout[i], qh facet_list, NULL, !qh_ALL); fclose(newGeomFile); +#ifdef IS_MPI + } +#endif } #endif //QHULL