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

Comparing branches/development/src/math/ConvexHull.cpp (file contents):
Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC vs.
Revision 1704 by gezelter, Tue Apr 24 20:40:04 2012 UTC

# Line 35 | Line 35
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).                        
38 > * [4] Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
39 > * [4] , Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). *
40   *
40 *
41   *  ConvexHull.cpp
42   *
43   *  Purpose: To calculate convexhull, hull volume libqhull.
# Line 62 | Line 62
62   #include <mpi.h>
63   #endif
64  
65 < using namespace OpenMD;
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  
70   ConvexHull::ConvexHull() : Hull(), dim_(3), options_("qhull Qt Pp") {
71   }
# Line 274 | Line 264 | void ConvexHull::computeHull(std::vector<StuntDouble*>
264  
265      face.addVertices(p[0], p[1], p[2]);
266      face.setFacetMass(faceMass);
267 <    face.setFacetVelocity(faceVel/3.0);
267 >    face.setFacetVelocity(faceVel / RealType(3.0));
268      /*
269      RealType comparea = face.computeArea();
270      realT calcarea = qh_facetarea (facet);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines