--- trunk/src/math/ConvexHull.hpp 2008/10/07 17:12:48 1302 +++ trunk/src/math/ConvexHull.hpp 2008/10/21 16:44:00 1308 @@ -44,7 +44,7 @@ * * Created by Charles F. Vardeman II on 11 Dec 2006. * @author Charles F. Vardeman II - * @version $Id: ConvexHull.hpp,v 1.12 2008-10-07 17:12:48 chuckv Exp $ + * @version $Id: ConvexHull.hpp,v 1.15 2008-10-21 16:44:00 chuckv Exp $ * */ @@ -62,14 +62,14 @@ extern "C" extern "C" { #if defined(HAVE_QHULL) -#include "qhull/qhull.h" -#include "qhull/mem.h" -#include "qhull/qset.h" -#include "qhull/geom.h" -#include "qhull/merge.h" -#include "qhull/poly.h" -#include "qhull/io.h" -#include "qhull/stat.h" +#include +#include +#include +#include +#include +#include +#include +#include #endif } #ifdef IS_MPI @@ -88,18 +88,20 @@ namespace oopse { int getNs(){return Ns_;} //Number of Surface Atoms RealType getVolume(){return volume_;} //Total Volume inclosed by Hull std::vector< StuntDouble* > getSurfaceAtoms(){return surfaceSDs_;} //Returns a list of surface atoms - std::vector getMesh(){return Triangles_;} + std::vector getMesh(){return Triangles_;} + int getNMeshElements() {return nTriangles_;} void printHull(const std::string& geomFileName); protected: double volume_; double area_; int dim_; int Ns_; + int nTriangles_; std::vector surfaceSDs_; const std::string options_; private: - std::vector Triangles_; + std::vector Triangles_; #ifdef IS_MPI int* NstoProc_;