ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/math/ConvexHull.cpp
(Generate patch)

Comparing trunk/src/math/ConvexHull.cpp (file contents):
Revision 1410 by chuckv, Wed Feb 24 15:22:03 2010 UTC vs.
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 2008, 2009, 2010 The University of Notre Dame. All Rights Reserved.
1 > /* Copyright (c) 2010 The University of Notre Dame. All Rights Reserved.
2   *
3   * The University of Notre Dame grants you ("Licensee") a
4   * non-exclusive, royalty free, license to use, modify and
# Line 32 | Line 32
32   * research, please cite the appropriate papers when you publish your
33   * work.  Good starting points are:
34   *                                                                      
35 < * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
36 < * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
37 < * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
38 < * [4]  Vardeman & Gezelter, in progress (2009).                        
35 > * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
36 > * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
37 > * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
38 > * [4] Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
39 > * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
40   *
40 *
41   *  ConvexHull.cpp
42   *
43 < *  Purpose: To calculate convexhull, hull volume libqhull.
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.21 2009-11-25 20:02:01 gezelter Exp $
48 < *
43 > *  Purpose: To calculate a convex hull.
44   */
45  
46 + #ifdef IS_MPI
47 + #include <mpi.h>
48 + #endif
49 +
50   /* Standard includes independent of library */
51  
52   #include <iostream>
# Line 58 | Line 57
57   #include "math/ConvexHull.hpp"
58   #include "utils/simError.h"
59  
60 < #ifdef IS_MPI
62 < #include <mpi.h>
63 < #endif
60 > #include "math/qhull.hpp"
61  
62 + #ifdef HAVE_QHULL
63   using namespace OpenMD;
64 + using namespace std;
65  
66 < #ifdef HAVE_QHULL
68 < extern "C"
69 < {
70 < #include <qhull/qhull.h>
71 < #include <qhull/mem.h>
72 < #include <qhull/qset.h>
73 < #include <qhull/geom.h>
74 < #include <qhull/merge.h>
75 < #include <qhull/poly.h>
76 < #include <qhull/io.h>
77 < #include <qhull/stat.h>
66 > ConvexHull::ConvexHull() : Hull(), dim_(3), options_("qhull FA Qt Pp") {
67   }
68  
69 < ConvexHull::ConvexHull() : Hull(), dim_(3), options_("qhull Qt Pp") {
70 < }
82 <
83 < void ConvexHull::computeHull(std::vector<StuntDouble*> bodydoubles) {
84 <
69 > void ConvexHull::computeHull(vector<StuntDouble*> bodydoubles) {
70 >  
71    int numpoints = bodydoubles.size();
72 <
72 >  
73    Triangles_.clear();
74    
75    vertexT *vertex, **vertexp;
76    facetT *facet;
77    setT *vertices;
78    int curlong, totlong;
93  pointT *intPoint;
94  
95  std::vector<double> ptArray(numpoints*dim_);
79  
80 +  vector<double> ptArray(numpoints*dim_);
81 +
82    // Copy the positon vector into a points vector for qhull.
83 <  std::vector<StuntDouble*>::iterator SD;
83 >  vector<StuntDouble*>::iterator SD;
84    int i = 0;
85 +
86    for (SD =bodydoubles.begin(); SD != bodydoubles.end(); ++SD){
87      Vector3d pos = (*SD)->getPos();      
88      ptArray[dim_ * i] = pos.x();
# Line 105 | Line 91 | void ConvexHull::computeHull(std::vector<StuntDouble*>
91      i++;
92    }
93    
94 +  /* Clean up memory from previous convex hull calculations */
95    boolT ismalloc = False;
109  /* Clean up memory from previous convex hull calculations*/
96    
97 +  /* compute the hull for our local points (or all the points for single
98 +     processor versions) */
99    if (qh_new_qhull(dim_, numpoints, &ptArray[0], ismalloc,
100                     const_cast<char *>(options_.c_str()), NULL, stderr)) {
101 <
101 >    
102      sprintf(painCave.errMsg, "ConvexHull: Qhull failed to compute convex hull");
103      painCave.isFatal = 1;
104      simError();
# Line 121 | Line 109 | void ConvexHull::computeHull(std::vector<StuntDouble*>
109   #ifdef IS_MPI
110    //If we are doing the mpi version, set up some vectors for data communication
111    
112 <  int nproc = MPI::COMM_WORLD.Get_size();
113 <  int myrank = MPI::COMM_WORLD.Get_rank();
112 >  int nproc;
113 >  int myrank;
114 >  
115 >  MPI_Comm_size( MPI_COMM_WORLD, &nproc);
116 >  MPI_Comm_rank( MPI_COMM_WORLD, &myrank);
117 >
118    int localHullSites = 0;
119  
120 <  std::vector<int> hullSitesOnProc(nproc, 0);
121 <  std::vector<int> coordsOnProc(nproc, 0);
122 <  std::vector<int> displacements(nproc, 0);
123 <  std::vector<int> vectorDisplacements(nproc, 0);
120 >  vector<int> hullSitesOnProc(nproc, 0);
121 >  vector<int> coordsOnProc(nproc, 0);
122 >  vector<int> displacements(nproc, 0);
123 >  vector<int> vectorDisplacements(nproc, 0);
124  
125 <  std::vector<double> coords;
126 <  std::vector<double> vels;
127 <  std::vector<int> indexMap;
128 <  std::vector<double> masses;
125 >  vector<double> coords;
126 >  vector<double> vels;
127 >  vector<int> indexMap;
128 >  vector<double> masses;
129  
130    FORALLvertices{
131      localHullSites++;
# Line 156 | Line 148 | void ConvexHull::computeHull(std::vector<StuntDouble*>
148      masses.push_back(sd->getMass());
149    }
150  
151 <  MPI::COMM_WORLD.Allgather(&localHullSites, 1, MPI::INT, &hullSitesOnProc[0],
152 <                            1, MPI::INT);
151 >  MPI_Allgather(&localHullSites, 1, MPI_INT, &hullSitesOnProc[0],
152 >                1, MPI_INT, MPI_COMM_WORLD);
153  
154    int globalHullSites = 0;
155    for (int iproc = 0; iproc < nproc; iproc++){
# Line 173 | Line 165 | void ConvexHull::computeHull(std::vector<StuntDouble*>
165      vectorDisplacements[iproc] = vectorDisplacements[iproc-1] + coordsOnProc[iproc-1];
166    }
167  
168 <  std::vector<double> globalCoords(dim_ * globalHullSites);
169 <  std::vector<double> globalVels(dim_ * globalHullSites);
170 <  std::vector<double> globalMasses(globalHullSites);
168 >  vector<double> globalCoords(dim_ * globalHullSites);
169 >  vector<double> globalVels(dim_ * globalHullSites);
170 >  vector<double> globalMasses(globalHullSites);
171  
172    int count = coordsOnProc[myrank];
173    
174 <  MPI::COMM_WORLD.Allgatherv(&coords[0], count, MPI::DOUBLE, &globalCoords[0],
175 <                             &coordsOnProc[0], &vectorDisplacements[0],
176 <                             MPI::DOUBLE);
177 <
178 <  MPI::COMM_WORLD.Allgatherv(&vels[0], count, MPI::DOUBLE, &globalVels[0],
179 <                             &coordsOnProc[0], &vectorDisplacements[0],
180 <                             MPI::DOUBLE);
181 <
182 <  MPI::COMM_WORLD.Allgatherv(&masses[0], localHullSites, MPI::DOUBLE,
183 <                             &globalMasses[0], &hullSitesOnProc[0],
184 <                             &displacements[0], MPI::DOUBLE);
185 <
174 >  MPI_Allgatherv(&coords[0], count, MPI_DOUBLE, &globalCoords[0],
175 >                 &coordsOnProc[0], &vectorDisplacements[0],
176 >                 MPI_DOUBLE, MPI_COMM_WORLD);
177 >  
178 >  MPI_Allgatherv(&vels[0], count, MPI_DOUBLE, &globalVels[0],
179 >                 &coordsOnProc[0], &vectorDisplacements[0],
180 >                 MPI_DOUBLE, MPI_COMM_WORLD);
181 >  
182 >  MPI_Allgatherv(&masses[0], localHullSites, MPI_DOUBLE,
183 >                 &globalMasses[0], &hullSitesOnProc[0],
184 >                 &displacements[0], MPI_DOUBLE, MPI_COMM_WORLD);
185 >  
186    // Free previous hull
187    qh_freeqhull(!qh_ALL);
188    qh_memfreeshort(&curlong, &totlong);
189 <  if (curlong || totlong)
190 <    std::cerr << "qhull internal warning (main): did not free %d bytes of long memory (%d pieces) "
191 <              << totlong << curlong << std::endl;
189 >  if (curlong || totlong) {
190 >    sprintf(painCave.errMsg, "ConvexHull: qhull internal warning:\n"
191 >            "\tdid not free %d bytes of long memory (%d pieces)",
192 >            totlong, curlong);
193 >    painCave.isFatal = 1;
194 >    simError();
195 >  }
196    
197    if (qh_new_qhull(dim_, globalHullSites, &globalCoords[0], ismalloc,
198                     const_cast<char *>(options_.c_str()), NULL, stderr)){
199      
200 <    sprintf(painCave.errMsg, "ConvexHull: Qhull failed to compute global convex hull");
200 >    sprintf(painCave.errMsg,
201 >            "ConvexHull: Qhull failed to compute global convex hull");
202      painCave.isFatal = 1;
203      simError();
204      
205    } //qh_new_qhull
206  
207   #endif
208 <  intPoint = qh interior_point;
209 <  RealType calcvol = 0.0;
208 >  // commented out below, so comment out here also.
209 >  // intPoint = qh interior_point;
210 >  // RealType calcvol = 0.0;
211 >  
212 >  qh_triangulate ();
213 >
214    FORALLfacets {  
215      Triangle face;
216      //Qhull sets the unit normal in facet->normal
# Line 260 | Line 261 | void ConvexHull::computeHull(std::vector<StuntDouble*>
261        vel = bodydoubles[id]->getVel();
262        mass = bodydoubles[id]->getMass();
263        face.addVertexSD(bodydoubles[id]);      
264 <
264 <
265 < #endif
266 <        
264 > #endif  
265        faceVel = faceVel + vel;
266        faceMass = faceMass + mass;
267        ver++;      
# Line 271 | Line 269 | void ConvexHull::computeHull(std::vector<StuntDouble*>
269  
270      face.addVertices(p[0], p[1], p[2]);
271      face.setFacetMass(faceMass);
272 <    face.setFacetVelocity(faceVel/3.0);
272 >    face.setFacetVelocity(faceVel / RealType(3.0));
273      /*
274      RealType comparea = face.computeArea();
275      realT calcarea = qh_facetarea (facet);
276      Vector3d V3dCompNorm = -face.computeUnitNormal();
277      RealType thisOffset = ((0.0-p[0][0])*V3dCompNorm[0] + (0.0-p[0][1])*V3dCompNorm[1] + (0.0-p[0][2])*V3dCompNorm[2]);
278      RealType dist = facet->offset + intPoint[0]*V3dNormal[0] + intPoint[1]*V3dNormal[1] + intPoint[2]*V3dNormal[2];
279 <    std::cout << "facet offset and computed offset: " << facet->offset << "  " << thisOffset <<  std::endl;
279 >    cout << "facet offset and computed offset: " << facet->offset << "  " << thisOffset <<  endl;
280      calcvol +=  -dist*comparea/qh hull_dim;
281      */
282      Triangles_.push_back(face);
# Line 289 | Line 287 | void ConvexHull::computeHull(std::vector<StuntDouble*>
287    qh_getarea(qh facet_list);
288    volume_ = qh totvol;
289    area_ = qh totarea;
290 <  //  std::cout << "My volume is: " << calcvol << " qhull volume is:" << volume_ << std::endl;
290 >    
291    qh_freeqhull(!qh_ALL);
292    qh_memfreeshort(&curlong, &totlong);
293 <  if (curlong || totlong)
294 <    std::cerr << "qhull internal warning (main): did not free %d bytes of long memory (%d pieces) "
295 <              << totlong << curlong << std::endl;    
293 >  if (curlong || totlong) {
294 >    sprintf(painCave.errMsg, "ConvexHull: qhull internal warning:\n"
295 >            "\tdid not free %d bytes of long memory (%d pieces)",
296 >            totlong, curlong);
297 >    painCave.isFatal = 1;
298 >    simError();
299 >  }
300   }
301  
302 < void ConvexHull::printHull(const std::string& geomFileName) {
303 <
302 > void ConvexHull::printHull(const string& geomFileName) {
303 >  
304   #ifdef IS_MPI
305    if (worldRank == 0)  {
306   #endif
307 <  FILE *newGeomFile;
308 <  
309 <  //create new .md file based on old .md file
310 <  newGeomFile = fopen(geomFileName.c_str(), "w");
311 <  qh_findgood_all(qh facet_list);
312 <  for (int i = 0; i < qh_PRINTEND; i++)
313 <    qh_printfacets(newGeomFile, qh PRINTout[i], qh facet_list, NULL, !qh_ALL);
314 <  
315 <  fclose(newGeomFile);
307 >    FILE *newGeomFile;
308 >    
309 >    //create new .md file based on old .md file
310 >    newGeomFile = fopen(geomFileName.c_str(), "w");
311 >    qh_findgood_all(qh facet_list);
312 >    for (int i = 0; i < qh_PRINTEND; i++)
313 >      qh_printfacets(newGeomFile, qh PRINTout[i], qh facet_list, NULL, !qh_ALL);
314 >    
315 >    fclose(newGeomFile);
316   #ifdef IS_MPI
317    }
318   #endif

Comparing trunk/src/math/ConvexHull.cpp (property svn:keywords):
Revision 1410 by chuckv, Wed Feb 24 15:22:03 2010 UTC vs.
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines