ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/staticProps/NanoVolume.hpp
(Generate patch)

Comparing trunk/src/applications/staticProps/NanoVolume.hpp (file contents):
Revision 1199 by chuckv, Thu Dec 6 20:40:38 2007 UTC vs.
Revision 1382 by gezelter, Thu Oct 22 14:22:55 2009 UTC

# Line 40 | Line 40
40   *
41   *  NanoVolume.hpp
42   *
43 *  Purpose: To calculate convexhull, hull volume and radius
44 *  using the CGAL library.
45 *
43   *  Created by Charles F. Vardeman II on 14 Dec 2006.
44   *  @author  Charles F. Vardeman II
45 < *  @version $Id: NanoVolume.hpp,v 1.4 2007-12-06 20:40:30 chuckv Exp $
45 > *  @version $Id: NanoVolume.hpp,v 1.7 2009-10-22 14:19:26 gezelter Exp $
46   *
47   */
48   #ifndef APPLICATIONS_STATICPROPS_NANOVOLUME_HPP_
# Line 57 | Line 54
54   #include "selection/SelectionManager.hpp"
55   #include "applications/staticProps/StaticAnalyser.hpp"
56  
60 #if defined(HAVE_QHULL) || defined(HAVE_CGAL)
57   #ifdef HAVE_QHULL
58   #include "math/ConvexHull.hpp"
59   #endif
60  
65 #ifdef HAVE_CGAL
66 #include "math/AlphaShape.hpp"
67 #endif
68 #endif
69
61   namespace oopse {
62    class NanoVolume : public StaticAnalyser {
63    public:
# Line 78 | Line 69 | namespace oopse {
69      std::string selectionScript_;
70      SelectionManager seleMan_;
71      SelectionEvaluator evaluator_;
72 <    std::vector<Vector3d> pos_;
72 >    std::vector<StuntDouble*> theAtoms_;
73      int frameCounter_;
74      RealType totalVolume_;
75      

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines