# | Line 58 | Line 58 | |
---|---|---|
58 | #include <utility> | |
59 | #include "math/AlphaHull.hpp" | |
60 | #include "utils/simError.h" | |
61 | – | |
61 | #ifdef IS_MPI | |
62 | #include <mpi.h> | |
63 | #endif | |
64 | + | #include "math/qhull.hpp" |
65 | ||
66 | using namespace OpenMD; | |
67 | ||
68 | #ifdef HAVE_QHULL | |
69 | – | extern "C" |
70 | – | { |
71 | – | #include <qhull/libqhull.h> |
72 | – | #include <qhull/mem.h> |
73 | – | #include <qhull/qset.h> |
74 | – | #include <qhull/geom.h> |
75 | – | #include <qhull/merge.h> |
76 | – | #include <qhull/poly.h> |
77 | – | #include <qhull/io.h> |
78 | – | #include <qhull/stat.h> |
79 | – | } |
69 | double calculate_circumradius(pointT* p0,pointT* p1,pointT* p2, int dim); | |
70 | ||
71 | AlphaHull::AlphaHull(double alpha) : Hull(), dim_(3), alpha_(alpha), options_("qhull d QJ Tcv Pp") { | |
# | Line 85 | Line 74 | void AlphaHull::computeHull(std::vector<StuntDouble*> | |
74 | void AlphaHull::computeHull(std::vector<StuntDouble*> bodydoubles) { | |
75 | ||
76 | int numpoints = bodydoubles.size(); | |
77 | < | bool alphashape=true; |
77 | > | // bool alphashape=true; |
78 | ||
79 | Triangles_.clear(); | |
80 | ||
81 | < | vertexT *vertex, **vertexp; |
81 | > | vertexT *vertex; |
82 | > | // vertexT **vertexp; |
83 | facetT *facet, *neighbor; | |
84 | < | setT *vertices, *verticestop, *verticesbottom; |
84 | > | // setT *vertices, *verticestop, *verticesbottom; |
85 | int curlong, totlong; | |
86 | pointT *interiorPoint; | |
87 |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |