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

Comparing trunk/src/math/ConvexHull.hpp (file contents):
Revision 1295 by chuckv, Wed Sep 17 00:45:42 2008 UTC vs.
Revision 1374 by chuckv, Tue Oct 20 20:05:28 2009 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 2008 The University of Notre Dame. All Rights Reserved.
1 > /* Copyright (c) 2008, 2009 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
# 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.hpp,v 1.11 2008-09-17 00:45:42 chuckv Exp $
47 > *  @version $Id: ConvexHull.hpp,v 1.18 2009-10-20 20:05:28 chuckv Exp $
48   *
49   */
50  
# Line 59 | Line 59
59   #include <cassert>
60   #include <vector>
61   #include <string>
62 extern "C"
63 {
64 #if defined(HAVE_QHULL)
65 #include "qhull/qhull.h"
66 #include "qhull/mem.h"
67 #include "qhull/qset.h"
68 #include "qhull/geom.h"
69 #include "qhull/merge.h"
70 #include "qhull/poly.h"
71 #include "qhull/io.h"
72 #include "qhull/stat.h"
73 #endif
74 }
75 #ifdef IS_MPI
76 #include <mpi.h>
77 #endif
62  
63  
64   namespace oopse {
65    class ConvexHull : public Hull {
66    public:
83    ConvexHull();
67  
68 +    ConvexHull();    
69      virtual ~ConvexHull(){};
70 <    void computeHull(std::vector<StuntDouble*> bodydoubles);
71 <    RealType getArea(){return area_;} //Total area of Hull
72 <    int getNs(){return Ns_;}  //Number of Surface Atoms
73 <    RealType getVolume(){return volume_;} //Total Volume inclosed by Hull
74 <    std::vector< StuntDouble* > getSurfaceAtoms(){return surfaceSDs_;} //Returns a list of surface atoms
75 <    std::vector<Triangle* > getMesh(){return Triangles_;}
70 >
71 >    void computeHull( std::vector<StuntDouble*> bodydoubles );
72 >
73 >    /* Total area of Hull*/
74 >    RealType getArea(){return area_;}
75 >
76 >    /* Total Volume enclosed by Hull */
77 >    RealType getVolume(){ return volume_; }
78 >
79 >    std::vector<Triangle> getMesh(){return Triangles_;}
80      void printHull(const std::string& geomFileName);
81 +
82    protected:
83 <    double volume_;
84 <    double area_;
83 >    RealType volume_;
84 >    RealType area_;
85      int dim_;
97    int Ns_;
98    std::vector< StuntDouble* > surfaceSDs_;
86      const std::string options_;
87 <    private:
88 <    std::vector<Triangle*> Triangles_;
89 <
103 < #ifdef IS_MPI
104 <    int* NstoProc_;
105 <    int* displs_;
106 <    int Nsglobal_;
107 <    int nproc_;
108 <    int myrank_;
109 <    struct surfacePt_{
110 <        double x,y,z;
111 <    };
112 <
113 <    MPI::Datatype surfacePtType;
114 <    std::vector<surfacePt_> surfacePtsLocal_;
115 <    std::vector<surfacePt_> surfacePtsGlobal_;
116 < #endif
117 <
87 >    
88 >  private:
89 >    std::vector<Triangle> Triangles_;
90    };
91   }
120
92   #endif /*MATH_CONVEXHULL_HPP_*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines