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

Comparing:
trunk/src/math/ConvexHull.cpp (file contents), Revision 1374 by chuckv, Tue Oct 20 20:05:28 2009 UTC vs.
branches/development/src/math/ConvexHull.cpp (file contents), Revision 1708 by gezelter, Tue May 15 13:02:10 2012 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 2008, 2009 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
5   * redistribute this software in source and binary code form, provided
6   * that the following conditions are met:
7   *
8 < * 1. Acknowledgement of the program authors must be made in any
9 < *    publication of scientific results based in part on use of the
10 < *    program.  An acceptable form of acknowledgement is citation of
11 < *    the article in which the program was described (Matthew
12 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
13 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
14 < *    Parallel Simulation Engine for Molecular Dynamics,"
15 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
16 < *
17 < * 2. Redistributions of source code must retain the above copyright
8 > * 1. Redistributions of source code must retain the above copyright
9   *    notice, this list of conditions and the following disclaimer.
10   *
11 < * 3. Redistributions in binary form must reproduce the above copyright
11 > * 2. Redistributions in binary form must reproduce the above copyright
12   *    notice, this list of conditions and the following disclaimer in the
13   *    documentation and/or other materials provided with the
14   *    distribution.
# Line 37 | Line 28
28   * University of Notre Dame has been advised of the possibility of
29   * such damages.
30   *
31 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
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] Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
39 + * [4] , Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). *
40   *
41   *  ConvexHull.cpp
42   *
# 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$
48   *
49   */
50  
# Line 62 | Line 62
62   #include <mpi.h>
63   #endif
64  
65 < using namespace oopse;
65 > #include "math/qhull.hpp"
66  
67   #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>
78 < }
68 > using namespace OpenMD;
69  
80 /* Old options Qt Qu Qg QG0 FA */
81 /* More old opts Qc Qi Pp*/
82
70   ConvexHull::ConvexHull() : Hull(), dim_(3), options_("qhull Qt Pp") {
71   }
72  
# Line 93 | Line 80 | void ConvexHull::computeHull(std::vector<StuntDouble*>
80    facetT *facet;
81    setT *vertices;
82    int curlong, totlong;
83 +  pointT *intPoint;
84    
85 <  std::vector<double> ptArray(numpoints*3);
98 <  std::vector<bool> isSurfaceID(numpoints);
85 >  std::vector<double> ptArray(numpoints*dim_);
86  
87    // Copy the positon vector into a points vector for qhull.
88    std::vector<StuntDouble*>::iterator SD;
# Line 108 | Line 95 | void ConvexHull::computeHull(std::vector<StuntDouble*>
95      i++;
96    }
97    
98 +  /* Clean up memory from previous convex hull calculations */
99    boolT ismalloc = False;
112  /* Clean up memory from previous convex hull calculations*/
100    
101 +  /* compute the hull for our local points (or all the points for single
102 +     processor versions) */
103    if (qh_new_qhull(dim_, numpoints, &ptArray[0], ismalloc,
104                     const_cast<char *>(options_.c_str()), NULL, stderr)) {
105 <
105 >    
106      sprintf(painCave.errMsg, "ConvexHull: Qhull failed to compute convex hull");
107      painCave.isFatal = 1;
108      simError();
# Line 127 | Line 116 | void ConvexHull::computeHull(std::vector<StuntDouble*>
116    int nproc = MPI::COMM_WORLD.Get_size();
117    int myrank = MPI::COMM_WORLD.Get_rank();
118    int localHullSites = 0;
130  int* hullSitesOnProc = new int[nproc];
131  int* coordsOnProc = new int[nproc];
132  int* displacements = new int[nproc];
133  int* vectorDisplacements = new int[nproc];
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);
124 +
125    std::vector<double> coords;
126    std::vector<double> vels;
127 <  std::vector<int> objectIDs;
127 >  std::vector<int> indexMap;
128    std::vector<double> masses;
129  
130    FORALLvertices{
131      localHullSites++;
132      
133      int idx = qh_pointid(vertex->point);
134 +
135 +    indexMap.push_back(idx);
136 +
137      coords.push_back(ptArray[dim_  * idx]);
138      coords.push_back(ptArray[dim_  * idx + 1]);
139      coords.push_back(ptArray[dim_  * idx + 2]);
# Line 159 | Line 152 | void ConvexHull::computeHull(std::vector<StuntDouble*>
152                              1, MPI::INT);
153  
154    int globalHullSites = 0;
155 <  for (int iproc = 0; i < nproc; iproc++){
155 >  for (int iproc = 0; iproc < nproc; iproc++){
156      globalHullSites += hullSitesOnProc[iproc];
157      coordsOnProc[iproc] = dim_ * hullSitesOnProc[iproc];
158    }
# Line 167 | Line 160 | void ConvexHull::computeHull(std::vector<StuntDouble*>
160    displacements[0] = 0;
161    vectorDisplacements[0] = 0;
162    
163 <  for (int iproc = 1; i < nproc; iproc++){
163 >  for (int iproc = 1; iproc < nproc; iproc++){
164      displacements[iproc] = displacements[iproc-1] + hullSitesOnProc[iproc-1];
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);
168 >  std::vector<double> globalCoords(dim_ * globalHullSites);
169 >  std::vector<double> globalVels(dim_ * globalHullSites);
170    std::vector<double> globalMasses(globalHullSites);
171 +
172    int count = coordsOnProc[myrank];
173    
174 <  MPI::COMM_WORLD.Allgatherv(&coords[0], count, MPI::DOUBLE,
175 <                             &globalCoords[0], &coordsOnProc[0], &vectorDisplacements[0],
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,
179 <                             &globalVels[0], &coordsOnProc[0], &vectorDisplacements[0],
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], &displacements[0],
184 <                             MPI::DOUBLE);
183 >                             &globalMasses[0], &hullSitesOnProc[0],
184 >                             &displacements[0], MPI::DOUBLE);
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)){
# Line 207 | Line 205 | void ConvexHull::computeHull(std::vector<StuntDouble*>
205  
206   #endif
207  
208 +  intPoint = qh interior_point;
209 +  RealType calcvol = 0.0;
210    FORALLfacets {  
211      Triangle face;
212 <
212 >    //Qhull sets the unit normal in facet->normal
213      Vector3d V3dNormal(facet->normal[0], facet->normal[1], facet->normal[2]);
214 <    face.setNormal(V3dNormal);
214 >    face.setUnitNormal(V3dNormal);
215      
216      RealType faceArea = qh_facetarea(facet);
217      face.setArea(faceArea);
# Line 225 | Line 225 | void ConvexHull::computeHull(std::vector<StuntDouble*>
225      Vector3d faceVel = V3Zero;
226      Vector3d p[3];
227      RealType faceMass = 0.0;
228 +
229      int ver = 0;
230  
231      FOREACHvertex_(vertices){
# Line 232 | Line 233 | void ConvexHull::computeHull(std::vector<StuntDouble*>
233        p[ver][0] = vertex->point[0];
234        p[ver][1] = vertex->point[1];
235        p[ver][2] = vertex->point[2];
235      
236        Vector3d vel;
237        RealType mass;
238  
# Line 242 | Line 242 | void ConvexHull::computeHull(std::vector<StuntDouble*>
242                       globalVels[dim_ * id + 2]);
243        mass = globalMasses[id];
244  
245 <      // localID will be between 0 and hullSitesOnProc[myrank] if we own this guy.
245 >      // localID will be between 0 and hullSitesOnProc[myrank] if we
246 >      // own this guy.
247 >
248        int localID = id - displacements[myrank];
249 <      if (id >= 0 && id < hullSitesOnProc[myrank])
250 <        face.addVertexSD(bodydoubles[localID]);
251 <      else
249 >
250 >
251 >      if (localID >= 0 && localID < hullSitesOnProc[myrank]){
252 >        face.addVertexSD(bodydoubles[indexMap[localID]]);
253 >      }else{
254          face.addVertexSD(NULL);
255 +      }
256   #else
257        vel = bodydoubles[id]->getVel();
258        mass = bodydoubles[id]->getMass();
259        face.addVertexSD(bodydoubles[id]);      
260 < #endif
256 <        
260 > #endif  
261        faceVel = faceVel + vel;
262        faceMass = faceMass + mass;
263        ver++;      
# Line 261 | Line 265 | void ConvexHull::computeHull(std::vector<StuntDouble*>
265  
266      face.addVertices(p[0], p[1], p[2]);
267      face.setFacetMass(faceMass);
268 <    face.setFacetVelocity(faceVel/3.0);
268 >    face.setFacetVelocity(faceVel / RealType(3.0));
269 >    /*
270 >    RealType comparea = face.computeArea();
271 >    realT calcarea = qh_facetarea (facet);
272 >    Vector3d V3dCompNorm = -face.computeUnitNormal();
273 >    RealType thisOffset = ((0.0-p[0][0])*V3dCompNorm[0] + (0.0-p[0][1])*V3dCompNorm[1] + (0.0-p[0][2])*V3dCompNorm[2]);
274 >    RealType dist = facet->offset + intPoint[0]*V3dNormal[0] + intPoint[1]*V3dNormal[1] + intPoint[2]*V3dNormal[2];
275 >    std::cout << "facet offset and computed offset: " << facet->offset << "  " << thisOffset <<  std::endl;
276 >    calcvol +=  -dist*comparea/qh hull_dim;
277 >    */
278      Triangles_.push_back(face);
279      qh_settempfree(&vertices);      
280  
# Line 270 | Line 283 | void ConvexHull::computeHull(std::vector<StuntDouble*>
283    qh_getarea(qh facet_list);
284    volume_ = qh totvol;
285    area_ = qh totarea;
286 <
274 < #ifdef IS_MPI
275 <  delete [] hullSitesOnProc;
276 <  delete [] coordsOnProc;
277 <  delete [] displacements;
278 <  delete [] vectorDisplacements;
279 < #endif
280 <  
286 >  //  std::cout << "My volume is: " << calcvol << " qhull volume is:" << volume_ << std::endl;
287    qh_freeqhull(!qh_ALL);
288    qh_memfreeshort(&curlong, &totlong);
289 <  if (curlong || totlong)
290 <    std::cerr << "qhull internal warning (main): did not free %d bytes of long memory (%d pieces) "
291 <              << totlong << curlong << std::endl;    
289 >  if (curlong || totlong) {
290 >    sprintf(painCave.errMsg, "ConvexHull: qhull internal warning:\n"
291 >            "\tdid not free %d bytes of long memory (%d pieces)",
292 >            totlong, curlong);
293 >    painCave.isFatal = 1;
294 >    simError();
295 >  }
296   }
297  
288
289
298   void ConvexHull::printHull(const std::string& geomFileName) {
299 +
300 + #ifdef IS_MPI
301 +  if (worldRank == 0)  {
302 + #endif
303    FILE *newGeomFile;
304    
305    //create new .md file based on old .md file
# Line 297 | Line 309 | void ConvexHull::printHull(const std::string& geomFile
309      qh_printfacets(newGeomFile, qh PRINTout[i], qh facet_list, NULL, !qh_ALL);
310    
311    fclose(newGeomFile);
312 + #ifdef IS_MPI
313 +  }
314 + #endif
315   }
316   #endif //QHULL

Comparing:
trunk/src/math/ConvexHull.cpp (property svn:keywords), Revision 1374 by chuckv, Tue Oct 20 20:05:28 2009 UTC vs.
branches/development/src/math/ConvexHull.cpp (property svn:keywords), Revision 1708 by gezelter, Tue May 15 13:02:10 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines