ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/math/AlphaHull.cpp

Comparing:
trunk/src/math/AlphaHull.cpp (file contents), Revision 1404 by chuckv, Fri Jan 15 20:46:49 2010 UTC vs.
branches/development/src/math/AlphaHull.cpp (file contents), Revision 1668 by gezelter, Fri Jan 6 19:03:05 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		*  AlphaHull.cpp
42		*
43		*  Purpose: To calculate Alpha hull, 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 $
47	>	*  @version $Id$
48		*
49		*/
50
#	Line 68 | Line 68 | extern "C"
68		#ifdef HAVE_QHULL
69		extern "C"
70		{
71	<	#include <qhull/qhull.h>
71	>	#include <qhull/libqhull.h>
72		#include <qhull/mem.h>
73		#include <qhull/qset.h>
74		#include <qhull/geom.h>
#	Line 358 | Line 358 | void AlphaHull::computeHull(std::vector<StuntDouble*>
358		facetlist.push_back(virtexlist);
359		face.addVertices(p[0],p[1],p[2]);
360		face.setFacetMass(faceMass);
361	<	face.setFacetVelocity(faceVel/3.0);
361	>	face.setFacetVelocity(faceVel / RealType(3.0));
362
363		RealType area = face.getArea();
364		area_ += area;

Comparing:
trunk/src/math/AlphaHull.cpp (property svn:keywords), Revision 1404 by chuckv, Fri Jan 15 20:46:49 2010 UTC vs.
branches/development/src/math/AlphaHull.cpp (property svn:keywords), Revision 1668 by gezelter, Fri Jan 6 19:03:05 2012 UTC

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

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines