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 1378 by gezelter, Wed Oct 21 15:48:12 2009 UTC vs.
branches/development/src/math/ConvexHull.cpp (file contents), Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 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, 234107 (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.19 2009-10-21 15:48:12 gezelter 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*dim_);
86  
87    // Copy the positon vector into a points vector for qhull.
88    std::vector<StuntDouble*>::iterator SD;
89    int i = 0;
90 +
91    for (SD =bodydoubles.begin(); SD != bodydoubles.end(); ++SD){
92      Vector3d pos = (*SD)->getPos();      
93      ptArray[dim_ * i] = pos.x();
# Line 107 | Line 96 | void ConvexHull::computeHull(std::vector<StuntDouble*>
96      i++;
97    }
98    
99 +  /* Clean up memory from previous convex hull calculations */
100    boolT ismalloc = False;
111  /* Clean up memory from previous convex hull calculations*/
101    
102 +  /* compute the hull for our local points (or all the points for single
103 +     processor versions) */
104    if (qh_new_qhull(dim_, numpoints, &ptArray[0], ismalloc,
105                     const_cast<char *>(options_.c_str()), NULL, stderr)) {
106 <
106 >    
107      sprintf(painCave.errMsg, "ConvexHull: Qhull failed to compute convex hull");
108      painCave.isFatal = 1;
109      simError();
# Line 126 | Line 117 | void ConvexHull::computeHull(std::vector<StuntDouble*>
117    int nproc = MPI::COMM_WORLD.Get_size();
118    int myrank = MPI::COMM_WORLD.Get_rank();
119    int localHullSites = 0;
129  int* hullSitesOnProc = new int[nproc];
130  int* coordsOnProc = new int[nproc];
131  int* displacements = new int[nproc];
132  int* vectorDisplacements = new int[nproc];
120  
121 +  std::vector<int> hullSitesOnProc(nproc, 0);
122 +  std::vector<int> coordsOnProc(nproc, 0);
123 +  std::vector<int> displacements(nproc, 0);
124 +  std::vector<int> vectorDisplacements(nproc, 0);
125 +
126    std::vector<double> coords;
127    std::vector<double> vels;
128    std::vector<int> indexMap;
# Line 195 | Line 187 | void ConvexHull::computeHull(std::vector<StuntDouble*>
187    // Free previous hull
188    qh_freeqhull(!qh_ALL);
189    qh_memfreeshort(&curlong, &totlong);
190 <  if (curlong || totlong)
191 <    std::cerr << "qhull internal warning (main): did not free %d bytes of long memory (%d pieces) "
192 <              << totlong << curlong << std::endl;
190 >  if (curlong || totlong) {
191 >    sprintf(painCave.errMsg, "ConvexHull: qhull internal warning:\n"
192 >            "\tdid not free %d bytes of long memory (%d pieces)",
193 >            totlong, curlong);
194 >    painCave.isFatal = 1;
195 >    simError();
196 >  }
197    
198    if (qh_new_qhull(dim_, globalHullSites, &globalCoords[0], ismalloc,
199                     const_cast<char *>(options_.c_str()), NULL, stderr)){
# Line 209 | Line 205 | void ConvexHull::computeHull(std::vector<StuntDouble*>
205    } //qh_new_qhull
206  
207   #endif
208 <
208 >  // commented out below, so comment out here also.
209 >  // intPoint = qh interior_point;
210 >  // RealType calcvol = 0.0;
211    FORALLfacets {  
212      Triangle face;
213 <
213 >    //Qhull sets the unit normal in facet->normal
214      Vector3d V3dNormal(facet->normal[0], facet->normal[1], facet->normal[2]);
215 <    face.setNormal(V3dNormal);
215 >    face.setUnitNormal(V3dNormal);
216      
217      RealType faceArea = qh_facetarea(facet);
218      face.setArea(faceArea);
# Line 236 | Line 234 | void ConvexHull::computeHull(std::vector<StuntDouble*>
234        p[ver][0] = vertex->point[0];
235        p[ver][1] = vertex->point[1];
236        p[ver][2] = vertex->point[2];
239      
237        Vector3d vel;
238        RealType mass;
239  
# Line 251 | Line 248 | void ConvexHull::computeHull(std::vector<StuntDouble*>
248  
249        int localID = id - displacements[myrank];
250  
251 <      if (localID >= 0 && localID < hullSitesOnProc[myrank])
251 >
252 >      if (localID >= 0 && localID < hullSitesOnProc[myrank]){
253          face.addVertexSD(bodydoubles[indexMap[localID]]);
254 <      
254 >      }else{
255 >        face.addVertexSD(NULL);
256 >      }
257   #else
258        vel = bodydoubles[id]->getVel();
259        mass = bodydoubles[id]->getMass();
260        face.addVertexSD(bodydoubles[id]);      
261 < #endif
262 <        
261 > #endif  
262        faceVel = faceVel + vel;
263        faceMass = faceMass + mass;
264        ver++;      
# Line 267 | Line 266 | void ConvexHull::computeHull(std::vector<StuntDouble*>
266  
267      face.addVertices(p[0], p[1], p[2]);
268      face.setFacetMass(faceMass);
269 <    face.setFacetVelocity(faceVel/3.0);
269 >    face.setFacetVelocity(faceVel / RealType(3.0));
270 >    /*
271 >    RealType comparea = face.computeArea();
272 >    realT calcarea = qh_facetarea (facet);
273 >    Vector3d V3dCompNorm = -face.computeUnitNormal();
274 >    RealType thisOffset = ((0.0-p[0][0])*V3dCompNorm[0] + (0.0-p[0][1])*V3dCompNorm[1] + (0.0-p[0][2])*V3dCompNorm[2]);
275 >    RealType dist = facet->offset + intPoint[0]*V3dNormal[0] + intPoint[1]*V3dNormal[1] + intPoint[2]*V3dNormal[2];
276 >    std::cout << "facet offset and computed offset: " << facet->offset << "  " << thisOffset <<  std::endl;
277 >    calcvol +=  -dist*comparea/qh hull_dim;
278 >    */
279      Triangles_.push_back(face);
280      qh_settempfree(&vertices);      
281  
# Line 276 | Line 284 | void ConvexHull::computeHull(std::vector<StuntDouble*>
284    qh_getarea(qh facet_list);
285    volume_ = qh totvol;
286    area_ = qh totarea;
287 <
280 < #ifdef IS_MPI
281 <  delete [] hullSitesOnProc;
282 <  delete [] coordsOnProc;
283 <  delete [] displacements;
284 <  delete [] vectorDisplacements;
285 < #endif
286 <  
287 >  //  std::cout << "My volume is: " << calcvol << " qhull volume is:" << volume_ << std::endl;
288    qh_freeqhull(!qh_ALL);
289    qh_memfreeshort(&curlong, &totlong);
290 <  if (curlong || totlong)
291 <    std::cerr << "qhull internal warning (main): did not free %d bytes of long memory (%d pieces) "
292 <              << totlong << curlong << std::endl;    
290 >  if (curlong || totlong) {
291 >    sprintf(painCave.errMsg, "ConvexHull: qhull internal warning:\n"
292 >            "\tdid not free %d bytes of long memory (%d pieces)",
293 >            totlong, curlong);
294 >    painCave.isFatal = 1;
295 >    simError();
296 >  }
297   }
298  
299   void ConvexHull::printHull(const std::string& geomFileName) {
300 +
301 + #ifdef IS_MPI
302 +  if (worldRank == 0)  {
303 + #endif
304    FILE *newGeomFile;
305    
306    //create new .md file based on old .md file
# Line 301 | Line 310 | void ConvexHull::printHull(const std::string& geomFile
310      qh_printfacets(newGeomFile, qh PRINTout[i], qh facet_list, NULL, !qh_ALL);
311    
312    fclose(newGeomFile);
313 + #ifdef IS_MPI
314 +  }
315 + #endif
316   }
317   #endif //QHULL

Comparing:
trunk/src/math/ConvexHull.cpp (property svn:keywords), Revision 1378 by gezelter, Wed Oct 21 15:48:12 2009 UTC vs.
branches/development/src/math/ConvexHull.cpp (property svn:keywords), Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines