| 32 |
|
* research, please cite the appropriate papers when you publish your |
| 33 |
|
* work. Good starting points are: |
| 34 |
|
* |
| 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). |
| 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, 234107 (2008). |
| 38 |
|
* [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). |
| 39 |
< |
* [4] , Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). * |
| 39 |
> |
* [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). |
| 40 |
|
* |
| 41 |
|
* ConvexHull.cpp |
| 42 |
|
* |
| 43 |
< |
* Purpose: To calculate convexhull, hull volume libqhull. |
| 44 |
< |
* |
| 45 |
< |
* Created by Charles F. Vardeman II on 11 Dec 2006. |
| 46 |
< |
* @author Charles F. Vardeman II |
| 47 |
< |
* @version $Id$ |
| 48 |
< |
* |
| 43 |
> |
* Purpose: To calculate a convex hull. |
| 44 |
|
*/ |
| 45 |
|
|
| 46 |
|
/* Standard includes independent of library */ |
| 57 |
|
#include <mpi.h> |
| 58 |
|
#endif |
| 59 |
|
|
| 60 |
< |
using namespace OpenMD; |
| 60 |
> |
#include "math/qhull.hpp" |
| 61 |
|
|
| 62 |
|
#ifdef HAVE_QHULL |
| 63 |
< |
extern "C" |
| 64 |
< |
{ |
| 70 |
< |
#include <qhull/libqhull.h> |
| 71 |
< |
#include <qhull/mem.h> |
| 72 |
< |
#include <qhull/qset.h> |
| 73 |
< |
#include <qhull/geom.h> |
| 74 |
< |
#include <qhull/merge.h> |
| 75 |
< |
#include <qhull/poly.h> |
| 76 |
< |
#include <qhull/io.h> |
| 77 |
< |
#include <qhull/stat.h> |
| 78 |
< |
} |
| 63 |
> |
using namespace OpenMD; |
| 64 |
> |
using namespace std; |
| 65 |
|
|
| 66 |
< |
ConvexHull::ConvexHull() : Hull(), dim_(3), options_("qhull Qt Pp") { |
| 66 |
> |
ConvexHull::ConvexHull() : Hull(), dim_(3), options_("qhull FA Qt Pp") { |
| 67 |
|
} |
| 68 |
|
|
| 69 |
< |
void ConvexHull::computeHull(std::vector<StuntDouble*> bodydoubles) { |
| 70 |
< |
|
| 69 |
> |
void ConvexHull::computeHull(vector<StuntDouble*> bodydoubles) { |
| 70 |
> |
|
| 71 |
|
int numpoints = bodydoubles.size(); |
| 72 |
< |
|
| 72 |
> |
|
| 73 |
|
Triangles_.clear(); |
| 74 |
|
|
| 75 |
|
vertexT *vertex, **vertexp; |
| 76 |
|
facetT *facet; |
| 77 |
|
setT *vertices; |
| 78 |
|
int curlong, totlong; |
| 93 |
– |
pointT *intPoint; |
| 94 |
– |
|
| 95 |
– |
std::vector<double> ptArray(numpoints*dim_); |
| 79 |
|
|
| 80 |
+ |
vector<double> ptArray(numpoints*dim_); |
| 81 |
+ |
|
| 82 |
|
// Copy the positon vector into a points vector for qhull. |
| 83 |
< |
std::vector<StuntDouble*>::iterator SD; |
| 83 |
> |
vector<StuntDouble*>::iterator SD; |
| 84 |
|
int i = 0; |
| 85 |
+ |
|
| 86 |
|
for (SD =bodydoubles.begin(); SD != bodydoubles.end(); ++SD){ |
| 87 |
|
Vector3d pos = (*SD)->getPos(); |
| 88 |
|
ptArray[dim_ * i] = pos.x(); |
| 113 |
|
int myrank = MPI::COMM_WORLD.Get_rank(); |
| 114 |
|
int localHullSites = 0; |
| 115 |
|
|
| 116 |
< |
std::vector<int> hullSitesOnProc(nproc, 0); |
| 117 |
< |
std::vector<int> coordsOnProc(nproc, 0); |
| 118 |
< |
std::vector<int> displacements(nproc, 0); |
| 119 |
< |
std::vector<int> vectorDisplacements(nproc, 0); |
| 116 |
> |
vector<int> hullSitesOnProc(nproc, 0); |
| 117 |
> |
vector<int> coordsOnProc(nproc, 0); |
| 118 |
> |
vector<int> displacements(nproc, 0); |
| 119 |
> |
vector<int> vectorDisplacements(nproc, 0); |
| 120 |
|
|
| 121 |
< |
std::vector<double> coords; |
| 122 |
< |
std::vector<double> vels; |
| 123 |
< |
std::vector<int> indexMap; |
| 124 |
< |
std::vector<double> masses; |
| 121 |
> |
vector<double> coords; |
| 122 |
> |
vector<double> vels; |
| 123 |
> |
vector<int> indexMap; |
| 124 |
> |
vector<double> masses; |
| 125 |
|
|
| 126 |
|
FORALLvertices{ |
| 127 |
|
localHullSites++; |
| 161 |
|
vectorDisplacements[iproc] = vectorDisplacements[iproc-1] + coordsOnProc[iproc-1]; |
| 162 |
|
} |
| 163 |
|
|
| 164 |
< |
std::vector<double> globalCoords(dim_ * globalHullSites); |
| 165 |
< |
std::vector<double> globalVels(dim_ * globalHullSites); |
| 166 |
< |
std::vector<double> globalMasses(globalHullSites); |
| 164 |
> |
vector<double> globalCoords(dim_ * globalHullSites); |
| 165 |
> |
vector<double> globalVels(dim_ * globalHullSites); |
| 166 |
> |
vector<double> globalMasses(globalHullSites); |
| 167 |
|
|
| 168 |
|
int count = coordsOnProc[myrank]; |
| 169 |
|
|
| 193 |
|
if (qh_new_qhull(dim_, globalHullSites, &globalCoords[0], ismalloc, |
| 194 |
|
const_cast<char *>(options_.c_str()), NULL, stderr)){ |
| 195 |
|
|
| 196 |
< |
sprintf(painCave.errMsg, "ConvexHull: Qhull failed to compute global convex hull"); |
| 196 |
> |
sprintf(painCave.errMsg, |
| 197 |
> |
"ConvexHull: Qhull failed to compute global convex hull"); |
| 198 |
|
painCave.isFatal = 1; |
| 199 |
|
simError(); |
| 200 |
|
|
| 201 |
|
} //qh_new_qhull |
| 202 |
|
|
| 203 |
|
#endif |
| 204 |
< |
intPoint = qh interior_point; |
| 205 |
< |
RealType calcvol = 0.0; |
| 204 |
> |
// commented out below, so comment out here also. |
| 205 |
> |
// intPoint = qh interior_point; |
| 206 |
> |
// RealType calcvol = 0.0; |
| 207 |
> |
|
| 208 |
> |
qh_triangulate (); |
| 209 |
> |
int num_facets = qh num_facets; |
| 210 |
> |
int num_vertices = qh num_vertices; |
| 211 |
> |
|
| 212 |
|
FORALLfacets { |
| 213 |
|
Triangle face; |
| 214 |
|
//Qhull sets the unit normal in facet->normal |
| 274 |
|
Vector3d V3dCompNorm = -face.computeUnitNormal(); |
| 275 |
|
RealType thisOffset = ((0.0-p[0][0])*V3dCompNorm[0] + (0.0-p[0][1])*V3dCompNorm[1] + (0.0-p[0][2])*V3dCompNorm[2]); |
| 276 |
|
RealType dist = facet->offset + intPoint[0]*V3dNormal[0] + intPoint[1]*V3dNormal[1] + intPoint[2]*V3dNormal[2]; |
| 277 |
< |
std::cout << "facet offset and computed offset: " << facet->offset << " " << thisOffset << std::endl; |
| 277 |
> |
cout << "facet offset and computed offset: " << facet->offset << " " << thisOffset << endl; |
| 278 |
|
calcvol += -dist*comparea/qh hull_dim; |
| 279 |
|
*/ |
| 280 |
|
Triangles_.push_back(face); |
| 285 |
|
qh_getarea(qh facet_list); |
| 286 |
|
volume_ = qh totvol; |
| 287 |
|
area_ = qh totarea; |
| 288 |
< |
// std::cout << "My volume is: " << calcvol << " qhull volume is:" << volume_ << std::endl; |
| 288 |
> |
|
| 289 |
|
qh_freeqhull(!qh_ALL); |
| 290 |
|
qh_memfreeshort(&curlong, &totlong); |
| 291 |
|
if (curlong || totlong) { |
| 297 |
|
} |
| 298 |
|
} |
| 299 |
|
|
| 300 |
< |
void ConvexHull::printHull(const std::string& geomFileName) { |
| 301 |
< |
|
| 300 |
> |
void ConvexHull::printHull(const string& geomFileName) { |
| 301 |
> |
|
| 302 |
|
#ifdef IS_MPI |
| 303 |
|
if (worldRank == 0) { |
| 304 |
|
#endif |
| 305 |
< |
FILE *newGeomFile; |
| 306 |
< |
|
| 307 |
< |
//create new .md file based on old .md file |
| 308 |
< |
newGeomFile = fopen(geomFileName.c_str(), "w"); |
| 309 |
< |
qh_findgood_all(qh facet_list); |
| 310 |
< |
for (int i = 0; i < qh_PRINTEND; i++) |
| 311 |
< |
qh_printfacets(newGeomFile, qh PRINTout[i], qh facet_list, NULL, !qh_ALL); |
| 312 |
< |
|
| 313 |
< |
fclose(newGeomFile); |
| 305 |
> |
FILE *newGeomFile; |
| 306 |
> |
|
| 307 |
> |
//create new .md file based on old .md file |
| 308 |
> |
newGeomFile = fopen(geomFileName.c_str(), "w"); |
| 309 |
> |
qh_findgood_all(qh facet_list); |
| 310 |
> |
for (int i = 0; i < qh_PRINTEND; i++) |
| 311 |
> |
qh_printfacets(newGeomFile, qh PRINTout[i], qh facet_list, NULL, !qh_ALL); |
| 312 |
> |
|
| 313 |
> |
fclose(newGeomFile); |
| 314 |
|
#ifdef IS_MPI |
| 315 |
|
} |
| 316 |
|
#endif |
