ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/math/ConvexHull.cpp

Comparing:
trunk/src/math/ConvexHull.cpp (file contents), Revision 1307 by chuckv, Mon Oct 20 19:36:32 2008 UTC vs.
branches/development/src/math/ConvexHull.cpp (file contents), Revision 1858 by gezelter, Wed Apr 3 21:32:13 2013 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 2008 The University of Notre Dame. All Rights Reserved.
1	>	/* Copyright (c) 2010 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
5		* redistribute this software in source and binary code form, provided
6		* that the following conditions are met:
7		*
8	<	* 1. Acknowledgement of the program authors must be made in any
9	<	*    publication of scientific results based in part on use of the
10	<	*    program.  An acceptable form of acknowledgement is citation of
11	<	*    the article in which the program was described (Matthew
12	<	*    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
13	<	*    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
14	<	*    Parallel Simulation Engine for Molecular Dynamics,"
15	<	*    J. Comput. Chem. 26, pp. 252-271 (2005))
16	<	*
17	<	* 2. Redistributions of source code must retain the above copyright
8	>	* 1. Redistributions of source code must retain the above copyright
9		*    notice, this list of conditions and the following disclaimer.
10		*
11	<	* 3. Redistributions in binary form must reproduce the above copyright
11	>	* 2. Redistributions in binary form must reproduce the above copyright
12		*    notice, this list of conditions and the following disclaimer in the
13		*    documentation and/or other materials provided with the
14		*    distribution.
#	Line 37 | Line 28
28		* University of Notre Dame has been advised of the possibility of
29		* such damages.
30		*
31	+	* SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
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, 234107 (2008).
38	+	* [4] Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
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: ConvexHull.cpp,v 1.11 2008-10-20 19:36:32 chuckv Exp $
48	<	*
43	>	*  Purpose: To calculate a convex hull.
44		*/
45
46		/* Standard includes independent of library */
47	+
48		#include <iostream>
49		#include <fstream>
50		#include <list>
#	Line 57 | Line 53
53		#include "math/ConvexHull.hpp"
54		#include "utils/simError.h"
55
60	–
61	–	using namespace oopse;
62	–
63	–	/* CGAL version of convex hull first then QHULL */
64	–	#ifdef HAVE_CGAL
65	–	//#include <CGAL/Homogeneous.h>
66	–	#include <CGAL/basic.h>
67	–	//#include <CGAL/Simple_cartesian.h>
68	–	#include <CGAL/Cartesian.h>
69	–	#include <CGAL/Origin.h>
70	–	#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
71	–	#include <CGAL/Convex_hull_traits_3.h>
72	–	#include <CGAL/convex_hull_3.h>
73	–	#include <CGAL/Polyhedron_traits_with_normals_3.h>
74	–	#include <CGAL/Polyhedron_3.h>
75	–	#include <CGAL/double.h>
76	–	#include <CGAL/number_utils.h>
77	–
78	–
79	–	//#include <CGAL/Quotient.h>
80	–	#include <CGAL/MP_Float.h>
81	–	//#include <CGAL/Lazy_exact_nt.h>
82	–
83	–
84	–
85	–	typedef CGAL::MP_Float RT;
86	–	//typedef double RT;
87	–	//typedef CGAL::Homogeneous<RT>                     K;
88	–	typedef CGAL::Exact_predicates_exact_constructions_kernel K;
89	–	typedef K::Vector_3                               Vector_3;
90	–	//typedef CGAL::Convex_hull_traits_3<K>             Traits;
91	–	typedef CGAL::Polyhedron_traits_with_normals_3<K> Traits;
92	–	//typedef Traits::Polyhedron_3                      Polyhedron_3;
93	–	typedef CGAL::Polyhedron_3<Traits>                     Polyhedron_3;
94	–	typedef K::Point_3                                Point_3;
95	–
96	–
97	–	typedef Polyhedron_3::HalfedgeDS             HalfedgeDS;
98	–	typedef Polyhedron_3::Facet_iterator                   Facet_iterator;
99	–	typedef Polyhedron_3::Halfedge_around_facet_circulator Halfedge_facet_circulator;
100	–	typedef Polyhedron_3::Halfedge_handle Halfedge_handle;
101	–	typedef Polyhedron_3::Facet_iterator Facet_iterator;
102	–	typedef Polyhedron_3::Plane_iterator Plane_iterator;
103	–	typedef Polyhedron_3::Vertex_iterator Vertex_iterator;
104	–	typedef Polyhedron_3::Vertex_handle Vertex_handle;
105	–	typedef Polyhedron_3::Point_iterator Point_iterator;
106	–
107	–
108	–
109	–	class Enriched_Point_3 : public K::Point_3{
110	–	public:
111	–	Enriched_Point_3(double x,double y,double z) : K::Point_3(x,y,z), yupMyPoint(false), mySD(NULL) {}
112	–
113	–	bool isMyPoint() const{ return yupMyPoint; }
114	–	void myPoint(){ yupMyPoint = true; }
115	–	void setSD(StuntDouble* SD){mySD = SD;}
116	–	StuntDouble* getStuntDouble(){return mySD;}
117	–	private:
118	–	bool yupMyPoint;
119	–	StuntDouble* mySD;
120	–
121	–	};
122	–
123	–
124	–
125	–
126	–
127	–	// compare Point_3's... used in setting up the STL map from points to indices
128	–	template <typename Pt3>
129	–	struct Point_3_comp {
130	–	bool operator() (const Pt3 & p, const Pt3 & q) const {
131	–	return CGAL::lexicographically_xyz_smaller(p,q); // this is defined inline & hence we had to create fn object & not ptrfun
132	–	}
133	–	};
134	–
135	–	// coordinate-based hashing inefficient but can we do better if pts are copied?
136	–	typedef std::map<Point_3, StuntDouble* ,Point_3_comp<Point_3> > ptMapType;
137	–
56		#ifdef IS_MPI
57	<	struct {
140	<	double x,y,z;
141	<	} surfacePt;
57	>	#include <mpi.h>
58		#endif
59
60	<	ConvexHull::ConvexHull() : Hull(){
145	<	//If we are doing the mpi version, set up some vectors for data communication
146	<	#ifdef IS_MPI
60	>	#include "math/qhull.hpp"
61
62	+	#ifdef HAVE_QHULL
63	+	using namespace OpenMD;
64	+	using namespace std;
65
66	<	nproc_ = MPI::COMM_WORLD.Get_size();
150	<	myrank_ = MPI::COMM_WORLD.Get_rank();
151	<	NstoProc_ = new int[nproc_];
152	<	displs_   = new int[nproc_];
153	<
154	<	// Create a surface point type in MPI to send
155	<	surfacePtType = MPI::DOUBLE.Create_contiguous(3);
156	<	surfacePtType.Commit();
157	<
158	<
159	<	#endif
66	>	ConvexHull::ConvexHull() : Hull(), dim_(3), options_("qhull Qt Pp") {
67		}
68
69	<	void ConvexHull::computeHull(std::vector<StuntDouble*> bodydoubles)
163	<	{
164	<
165	<	std::vector<Enriched_Point_3> points;
166	<	ptMapType myMap;
167	<	Point_iterator   hc;
69	>	void ConvexHull::computeHull(vector<StuntDouble*> bodydoubles) {
70
71	<	// Copy the positon vector into a points vector for cgal.
72	<	std::vector<StuntDouble*>::iterator SD;
71	>	int numpoints = bodydoubles.size();
72	>
73	>	Triangles_.clear();
74	>
75	>	vertexT *vertex, **vertexp;
76	>	facetT *facet;
77	>	setT *vertices;
78	>	int curlong, totlong;
79
80	<	for (SD =bodydoubles.begin(); SD != bodydoubles.end(); ++SD)
81	<	{
174	<	Vector3d pos = (*SD)->getPos();
175	<	Enriched_Point_3* pt = new Enriched_Point_3(pos.x(),pos.y(),pos.z());
176	<	pt->setSD(*SD);
177	<	points.push_back(*pt);
178	<	// myMap[pt]=(*SD);
179	<	}
80	>	Vector3d boxMax;
81	>	Vector3d boxMin;
82
83	<	// define object to hold convex hull
182	<	CGAL::Object ch_object_;
183	<	Polyhedron_3 polyhedron;
83	>	vector<double> ptArray(numpoints*dim_);
84
85	<	// compute convex hull
85	>	// Copy the positon vector into a points vector for qhull.
86	>	vector<StuntDouble*>::iterator SD;
87	>	int i = 0;
88
89	<	std::vector<Enriched_Point_3>::iterator testpt;
89	>	for (SD =bodydoubles.begin(); SD != bodydoubles.end(); ++SD){
90	>	Vector3d pos = (*SD)->getPos();
91	>	ptArray[dim_ * i] = pos.x();
92	>	ptArray[dim_ * i + 1] = pos.y();
93	>	ptArray[dim_ * i + 2] = pos.z();
94	>	i++;
95	>	}
96
97	+	/* Clean up memory from previous convex hull calculations */
98	+	boolT ismalloc = False;
99
100	<
101	<	CGAL::convex_hull_3(points.begin(), points.end(), polyhedron);
102	<
100	>	/* compute the hull for our local points (or all the points for single
101	>	processor versions) */
102	>	if (qh_new_qhull(dim_, numpoints, &ptArray[0], ismalloc,
103	>	const_cast<char *>(options_.c_str()), NULL, stderr)) {
104	>
105	>	sprintf(painCave.errMsg, "ConvexHull: Qhull failed to compute convex hull");
106	>	painCave.isFatal = 1;
107	>	simError();
108	>
109	>	} //qh_new_qhull
110
194	–
195	–	Ns_ = polyhedron.size_of_vertices();
111
112		#ifdef IS_MPI
113	<	/* Gather an array of the number of verticies on each processor */
113	>	//If we are doing the mpi version, set up some vectors for data communication
114
115	+	int nproc = MPI::COMM_WORLD.Get_size();
116	+	int myrank = MPI::COMM_WORLD.Get_rank();
117	+	int localHullSites = 0;
118
119	<	surfacePtsGlobal_.clear();
120	<	surfacePtsLocal_.clear();
119	>	vector<int> hullSitesOnProc(nproc, 0);
120	>	vector<int> coordsOnProc(nproc, 0);
121	>	vector<int> displacements(nproc, 0);
122	>	vector<int> vectorDisplacements(nproc, 0);
123
124	<	MPI::COMM_WORLD.Allgather(&Ns_,1,MPI::INT,&NstoProc_[0],1,MPI::INT);
124	>	vector<double> coords;
125	>	vector<double> vels;
126	>	vector<int> indexMap;
127	>	vector<double> masses;
128
129	<	for (int i = 0; i < nproc_; i++){
130	<	Nsglobal_ += NstoProc_[i];
131	<	}
132	<	/*Reminder ideally, we would like to reserve size for the vectors here*/
133	<	surfacePtsLocal_.reserve(Ns_);
134	<	surfacePtsGlobal_.resize(Nsglobal_);
212	<	//  std::fill(surfacePtsGlobal_.begin(),surfacePtsGlobal_.end(),0);
129	>	FORALLvertices{
130	>	localHullSites++;
131	>
132	>	int idx = qh_pointid(vertex->point);
133	>
134	>	indexMap.push_back(idx);
135
136	<	/* Build a displacements array */
137	<	for (int i = 1; i < nproc_; i++){
138	<	displs_[i] = displs_[i-1] + NstoProc_[i-1];
217	<	}
218	<
219	<	int noffset = displs_[myrank_];
220	<	/* gather the potential hull */
221	<
222	<
223	<	for (hc =polyhedron.points_begin();hc != polyhedron.points_end(); ++hc){
224	<	Point_3 mypoint = *hc;
225	<	surfacePt_ mpiSurfacePt;
226	<	mpiSurfacePt.x = CGAL::to_double(mypoint.x());
227	<	mpiSurfacePt.y = CGAL::to_double(mypoint.y());
228	<	mpiSurfacePt.z = CGAL::to_double(mypoint.z());
229	<	surfacePtsLocal_.push_back(mpiSurfacePt);
230	<	}
136	>	coords.push_back(ptArray[dim_  * idx]);
137	>	coords.push_back(ptArray[dim_  * idx + 1]);
138	>	coords.push_back(ptArray[dim_  * idx + 2]);
139
140	<	MPI::COMM_WORLD.Allgatherv(&surfacePtsLocal_[0],Ns_,surfacePtType,&surfacePtsGlobal_[0],NstoProc_,displs_,surfacePtType);
233	<	std::vector<surfacePt_>::iterator spt;
234	<	std::vector<Enriched_Point_3> gblpoints;
140	>	StuntDouble* sd = bodydoubles[idx];
141
142	<	int mine = 0;
143	<	int pointidx = 0;
144	<	for (spt = surfacePtsGlobal_.begin(); spt != surfacePtsGlobal_.end(); ++spt)
145	<	{
240	<	surfacePt_ thispos = *spt;
241	<	Enriched_Point_3 ept(thispos.x,thispos.y,thispos.z);
242	<	if (mine >= noffset && mine < noffset + Ns_){
243	<	ept.myPoint();
244	<	ept.setSD(points[pointidx].getStuntDouble());
245	<	pointidx++;
246	<	}
247	<	gblpoints.push_back(ept);
142	>	Vector3d vel = sd->getVel();
143	>	vels.push_back(vel.x());
144	>	vels.push_back(vel.y());
145	>	vels.push_back(vel.z());
146
147	<	mine++;
148	<	}
147	>	masses.push_back(sd->getMass());
148	>	}
149
150	<	/* Compute the global hull */
151	<	polyhedron.clear();
254	<	CGAL::convex_hull_3(gblpoints.begin(), gblpoints.end(), polyhedron);
150	>	MPI::COMM_WORLD.Allgather(&localHullSites, 1, MPI::INT, &hullSitesOnProc[0],
151	>	1, MPI::INT);
152
153	<
154	<	#endif
155	<
156	<
260	<
261	<	/* Loop over all of the surface triangles and build data structures for atoms and normals*/
262	<	Facet_iterator j;
263	<	area_ = 0;
264	<	for ( j = polyhedron.facets_begin(); j !=polyhedron.facets_end(); ++j) {
265	<	Halfedge_handle h = j->halfedge();
266	<
267	<	Point_3 r0=h->vertex()->point();
268	<	Point_3 r1=h->next()->vertex()->point();
269	<	Point_3 r2=h->next()->next()->vertex()->point();
270	<
271	<	Point_3* pr0 = &r0;
272	<	Point_3* pr1 = &r1;
273	<	Point_3* pr2 = &r2;
274	<
275	<	Enriched_Point_3* er0 = static_cast<Enriched_Point_3*>(pr0);
276	<	Enriched_Point_3* er1 = static_cast<Enriched_Point_3*>(pr1);
277	<	Enriched_Point_3* er2 = static_cast<Enriched_Point_3*>(pr2);
278	<
279	<	// StuntDouble* sd = er0->getStuntDouble();
280	<	std::cerr << "sd globalIndex = " << to_double(er0->x()) << "\n";
281	<
282	<	Point_3 thisCentroid = CGAL::centroid(r0,r1,r2);
283	<
284	<	Vector_3 normal = CGAL::cross_product(r1-r0,r2-r0);
285	<
286	<	Triangle* face = new Triangle();
287	<	Vector3d V3dNormal(CGAL::to_double(normal.x()),CGAL::to_double(normal.y()),CGAL::to_double(normal.z()));
288	<	Vector3d V3dCentroid(CGAL::to_double(thisCentroid.x()),CGAL::to_double(thisCentroid.y()),CGAL::to_double(thisCentroid.z()));
289	<	face->setNormal(V3dNormal);
290	<	face->setCentroid(V3dCentroid);
291	<	RealType faceArea = 0.5*V3dNormal.length();
292	<	face->setArea(faceArea);
293	<	area_ += faceArea;
294	<	Triangles_.push_back(face);
295	<	//    ptMapType::const_iterator locn=myMap.find(mypoint);
296	<	//    int myIndex = locn->second;
297	<
153	>	int globalHullSites = 0;
154	>	for (int iproc = 0; iproc < nproc; iproc++){
155	>	globalHullSites += hullSitesOnProc[iproc];
156	>	coordsOnProc[iproc] = dim_ * hullSitesOnProc[iproc];
157		}
299	–
300	–	std::cout << "Number of surface atoms is: " << Ns_ << std::endl;
301	–
158
159	<
160	<	}
305	<	void ConvexHull::printHull(const std::string& geomFileName)
306	<	{
307	<	/*
308	<	std::ofstream newGeomFile;
159	>	displacements[0] = 0;
160	>	vectorDisplacements[0] = 0;
161
162	<	//create new .md file based on old .md file
163	<	newGeomFile.open("testhull.off");
164	<
313	<	// Write polyhedron in Object File Format (OFF).
314	<	CGAL::set_ascii_mode( std::cout);
315	<	newGeomFile << "OFF" << std::endl << polyhedron.size_of_vertices() << ' '
316	<	<< polyhedron.size_of_facets() << " 0" << std::endl;
317	<	std::copy( polyhedron.points_begin(), polyhedron.points_end(),
318	<	std::ostream_iterator<Point_3>( newGeomFile, "\n"));
319	<	for (  Facet_iterator i = polyhedron.facets_begin(); i != polyhedron.facets_end(); ++i) {
320	<	Halfedge_facet_circulator j = i->facet_begin();
321	<	// Facets in polyhedral surfaces are at least triangles.
322	<	CGAL_assertion( CGAL::circulator_size(j) >= 3);
323	<	newGeomFile << CGAL::circulator_size(j) << ' ';
324	<	do {
325	<	newGeomFile << ' ' << std::distance(polyhedron.vertices_begin(), j->vertex());
326	<	} while ( ++j != i->facet_begin());
327	<	newGeomFile << std::endl;
162	>	for (int iproc = 1; iproc < nproc; iproc++){
163	>	displacements[iproc] = displacements[iproc-1] + hullSitesOnProc[iproc-1];
164	>	vectorDisplacements[iproc] = vectorDisplacements[iproc-1] + coordsOnProc[iproc-1];
165		}
329	–
330	–	newGeomFile.close();
331	–	*/
332	–	/*
333	–	std::ofstream newGeomFile;
166
167	<	//create new .md file based on old .md file
168	<	newGeomFile.open(geomFileName.c_str());
167	>	vector<double> globalCoords(dim_ * globalHullSites);
168	>	vector<double> globalVels(dim_ * globalHullSites);
169	>	vector<double> globalMasses(globalHullSites);
170
171	<	// Write polyhedron in Object File Format (OFF).
339	<	CGAL::set_ascii_mode( std::cout);
340	<	newGeomFile << "OFF" << std::endl << ch_polyhedron.size_of_vertices() << ' '
341	<	<< ch_polyhedron.size_of_facets() << " 0" << std::endl;
342	<	std::copy( ch_polyhedron.points_begin(), ch_polyhedron.points_end(),
343	<	std::ostream_iterator<Point_3>( newGeomFile, "\n"));
344	<	for (  Facet_iterator i = ch_polyhedron.facets_begin(); i != ch_polyhedron.facets_end(); ++i)
345	<	{
346	<	Halfedge_facet_circulator j = i->facet_begin();
347	<	// Facets in polyhedral surfaces are at least triangles.
348	<	CGAL_assertion( CGAL::circulator_size(j) >= 3);
349	<	newGeomFile << CGAL::circulator_size(j) << ' ';
350	<	do
351	<	{
352	<	newGeomFile << ' ' << std::distance(ch_polyhedron.vertices_begin(), j->vertex());
353	<	}
354	<	while ( ++j != i->facet_begin());
355	<	newGeomFile << std::endl;
356	<	}
357	<
358	<	newGeomFile.close();
359	<	*/
360	<
361	<	}
362	<
363	<
364	<
365	<
366	<
367	<
368	<
369	<	#else
370	<	#ifdef HAVE_QHULL
371	<	/* Old options Qt Qu Qg QG0 FA */
372	<	/* More old opts Qc Qi Pp*/
373	<	ConvexHull::ConvexHull() : Hull(), dim_(3), options_("qhull Qt Pp"), Ns_(200), nTriangles_(0) {
374	<	//If we are doing the mpi version, set up some vectors for data communication
375	<	#ifdef IS_MPI
376	<
377	<
378	<	nproc_ = MPI::COMM_WORLD.Get_size();
379	<	myrank_ = MPI::COMM_WORLD.Get_rank();
380	<	NstoProc_ = new int[nproc_];
381	<	displs_   = new int[nproc_];
382	<
383	<	// Create a surface point type in MPI to send
384	<	//surfacePtType = MPI::DOUBLE.Create_contiguous(3);
385	<	// surfacePtType.Commit();
386	<
387	<
388	<	#endif
389	<	}
390	<
391	<
392	<
393	<	void ConvexHull::computeHull(std::vector<StuntDouble*> bodydoubles)
394	<	{
171	>	int count = coordsOnProc[myrank];
172
173	<	std::vector<int> surfaceIDs;
174	<	std::vector<int> surfaceIDsGlobal;
175	<	std::vector<int> localPtsMap;
399	<	int numpoints = bodydoubles.size();
173	>	MPI::COMM_WORLD.Allgatherv(&coords[0], count, MPI::DOUBLE, &globalCoords[0],
174	>	&coordsOnProc[0], &vectorDisplacements[0],
175	>	MPI::DOUBLE);
176
177	<	//coordT* pt_array;
178	<	coordT* surfpt_array;
179	<	vertexT *vertex, **vertexp;
404	<	facetT *facet;
405	<	setT *vertices;
406	<	int curlong,totlong;
407	<	int id;
408	<
409	<	coordT *point,**pointp;
177	>	MPI::COMM_WORLD.Allgatherv(&vels[0], count, MPI::DOUBLE, &globalVels[0],
178	>	&coordsOnProc[0], &vectorDisplacements[0],
179	>	MPI::DOUBLE);
180
181	+	MPI::COMM_WORLD.Allgatherv(&masses[0], localHullSites, MPI::DOUBLE,
182	+	&globalMasses[0], &hullSitesOnProc[0],
183	+	&displacements[0], MPI::DOUBLE);
184
185	<	FILE *outdummy = NULL;
186	<	FILE *errdummy = NULL;
185	>	// Free previous hull
186	>	qh_freeqhull(!qh_ALL);
187	>	qh_memfreeshort(&curlong, &totlong);
188	>	if (curlong || totlong) {
189	>	sprintf(painCave.errMsg, "ConvexHull: qhull internal warning:\n"
190	>	"\tdid not free %d bytes of long memory (%d pieces)",
191	>	totlong, curlong);
192	>	painCave.isFatal = 1;
193	>	simError();
194	>	}
195
196	<	//pt_array = (coordT*) malloc(sizeof(coordT) * (numpoints * dim_));
197	<
198	<	//  double* ptArray = new double[numpoints * 3];
199	<	std::vector<double> ptArray(numpoints*3);
200	<	std::vector<bool> isSurfaceID(numpoints);
201	<
202	<	// Copy the positon vector into a points vector for qhull.
203	<	std::vector<StuntDouble*>::iterator SD;
423	<	int i = 0;
424	<	for (SD =bodydoubles.begin(); SD != bodydoubles.end(); ++SD)
425	<	{
426	<	Vector3d pos = (*SD)->getPos();
427	<
428	<	ptArray[dim_ * i] = pos.x();
429	<	ptArray[dim_ * i + 1] = pos.y();
430	<	ptArray[dim_ * i + 2] = pos.z();
431	<	i++;
432	<	}
433	<
434	<
435	<
436	<
437	<
438	<
439	<	boolT ismalloc = False;
440	<	/* Clean up memory from previous convex hull calculations*/
441	<	Triangles_.clear();
442	<	surfaceSDs_.clear();
443	<	surfaceSDs_.reserve(Ns_);
444	<
445	<	if (qh_new_qhull(dim_, numpoints, &ptArray[0], ismalloc,
446	<	const_cast<char *>(options_.c_str()), NULL, stderr)) {
447	<
448	<	sprintf(painCave.errMsg, "ConvexHull: Qhull failed to compute convex hull");
449	<	painCave.isFatal = 1;
450	<	simError();
451	<
196	>	if (qh_new_qhull(dim_, globalHullSites, &globalCoords[0], ismalloc,
197	>	const_cast<char *>(options_.c_str()), NULL, stderr)){
198	>
199	>	sprintf(painCave.errMsg,
200	>	"ConvexHull: Qhull failed to compute global convex hull");
201	>	painCave.isFatal = 1;
202	>	simError();
203	>
204		} //qh_new_qhull
205
206	<
207	<	#ifdef IS_MPI
208	<	std::vector<double> localPts;
209	<	std::vector<double> localVel;
210	<	int localPtArraySize;
211	<
212	<
213	<	std::fill(isSurfaceID.begin(),isSurfaceID.end(),false);
214	<
463	<
464	<	FORALLfacets {
206	>	#endif
207	>	// commented out below, so comment out here also.
208	>	// intPoint = qh interior_point;
209	>	// RealType calcvol = 0.0;
210	>	FORALLfacets {
211	>	Triangle face;
212	>	//Qhull sets the unit normal in facet->normal
213	>	Vector3d V3dNormal(facet->normal[0], facet->normal[1], facet->normal[2]);
214	>	face.setUnitNormal(V3dNormal);
215
216	<	if (!facet->simplicial){
217	<	// should never happen with Qt
468	<	sprintf(painCave.errMsg, "ConvexHull: non-simplicaial facet detected");
469	<	painCave.isFatal = 1;
470	<	simError();
471	<	}
216	>	RealType faceArea = qh_facetarea(facet);
217	>	face.setArea(faceArea);
218
473	–
219		vertices = qh_facet3vertex(facet);
475	–	FOREACHvertex_(vertices){
476	–	id = qh_pointid(vertex->point);
477	–
478	–	if( !isSurfaceID[id] ){
479	–	isSurfaceID[id] = true;
480	–	}
481	–	}
482	–	qh_settempfree(&vertices);
220
221	<	} //FORALLfacets
221	>	coordT *center = qh_getcenter(vertices);
222	>	Vector3d V3dCentroid(center[0], center[1], center[2]);
223	>	face.setCentroid(V3dCentroid);
224
225	<
225	>	Vector3d faceVel = V3Zero;
226	>	Vector3d p[3];
227	>	RealType faceMass = 0.0;
228
229	<	/*
489	<	std::sort(surfaceIDs.begin(),surfaceIDs.end());
490	<	surfaceIDs.erase(std::unique(surfaceIDs.begin(), surfaceIDs.end()), surfaceIDs.end());
491	<	int localPtArraySize = surfaceIDs.size() * 3;
492	<	*/
229	>	int ver = 0;
230
231	<	//localPts.resize(localPtArraySize);
232	<	//std::fill(localPts.begin(),localPts.end(),0.0);
231	>	FOREACHvertex_(vertices){
232	>	int id = qh_pointid(vertex->point);
233	>	p[ver][0] = vertex->point[0];
234	>	p[ver][1] = vertex->point[1];
235	>	p[ver][2] = vertex->point[2];
236	>	Vector3d vel;
237	>	RealType mass;
238
239	+	#ifdef IS_MPI
240	+	vel = Vector3d(globalVels[dim_ * id],
241	+	globalVels[dim_ * id + 1],
242	+	globalVels[dim_ * id + 2]);
243	+	mass = globalMasses[id];
244
245	<	int idx = 0;
246	<	int nIsIts = 0;
500	<	/*
501	<	// Copy the surface points into an array.
502	<	for(std::vector<bool>::iterator list_iter = isSurfaceID.begin();
503	<	list_iter != isSurfaceID.end(); list_iter++)
504	<	{
505	<	bool isIt = *list_iter;
506	<	if (isIt){
507	<	localPts.push_back(ptArray[dim_ * idx]);
508	<	localPts.push_back(ptArray[dim_ * idx + 1]);
509	<	localPts.push_back(ptArray[dim_ * idx + 2]);
510	<	localPtsMap.push_back(idx);
511	<	nIsIts++;
512	<	} //Isit
513	<	idx++;
514	<	} //isSurfaceID
515	<	*/
516	<	FORALLvertices {
517	<	idx = qh_pointid(vertex->point);
518	<	localPts.push_back(ptArray[dim_ * idx]);
519	<	localPts.push_back(ptArray[dim_ * idx + 1]);
520	<	localPts.push_back(ptArray[dim_ * idx + 2]);
245	>	// localID will be between 0 and hullSitesOnProc[myrank] if we
246	>	// own this guy.
247
248	<	Vector3d vel = bodydoubles[idx]->getVel();
523	<	localVel.push_back(vel.x());
524	<	localVel.push_back(vel.y());
525	<	localVel.push_back(vel.z());
248	>	int localID = id - displacements[myrank];
249
527	–	localPtsMap.push_back(idx);
528	–	}
250
251	+	if (localID >= 0 && localID < hullSitesOnProc[myrank]){
252	+	face.addVertexSD(bodydoubles[indexMap[localID]]);
253	+	}else{
254	+	face.addVertexSD(NULL);
255	+	}
256	+	#else
257	+	vel = bodydoubles[id]->getVel();
258	+	mass = bodydoubles[id]->getMass();
259	+	face.addVertexSD(bodydoubles[id]);
260	+	#endif
261	+	faceVel = faceVel + vel;
262	+	faceMass = faceMass + mass;
263	+	ver++;
264	+	} //Foreachvertex
265
266	<	localPtArraySize = localPts.size();
266	>	face.addVertices(p[0], p[1], p[2]);
267	>	face.setFacetMass(faceMass);
268	>	face.setFacetVelocity(faceVel / RealType(3.0));
269	>	/*
270	>	RealType comparea = face.computeArea();
271	>	realT calcarea = qh_facetarea (facet);
272	>	Vector3d V3dCompNorm = -face.computeUnitNormal();
273	>	RealType thisOffset = ((0.0-p[0][0])*V3dCompNorm[0] + (0.0-p[0][1])*V3dCompNorm[1] + (0.0-p[0][2])*V3dCompNorm[2]);
274	>	RealType dist = facet->offset + intPoint[0]*V3dNormal[0] + intPoint[1]*V3dNormal[1] + intPoint[2]*V3dNormal[2];
275	>	cout << "facet offset and computed offset: " << facet->offset << "  " << thisOffset <<  endl;
276	>	calcvol +=  -dist*comparea/qh hull_dim;
277	>	*/
278	>	Triangles_.push_back(face);
279	>	qh_settempfree(&vertices);
280
281	<
534	<	MPI::COMM_WORLD.Allgather(&localPtArraySize,1,MPI::INT,&NstoProc_[0],1,MPI::INT);
535	<
536	<	Nsglobal_=0;
537	<	for (int i = 0; i < nproc_; i++){
538	<	Nsglobal_ += NstoProc_[i];
539	<	}
281	>	} //FORALLfacets
282
283	<
284	<	int nglobalPts = int(Nsglobal_/3);
285	<
283	>	qh_getarea(qh facet_list);
284	>	volume_ = qh totvol;
285	>	area_ = qh totarea;
286
287	<	std::vector<double> globalPts(Nsglobal_);
288	<	std::vector<double> globalVel(Nsglobal_);
289	<
290	<	isSurfaceID.resize(nglobalPts);
291	<
292	<
293	<	std::fill(globalPts.begin(),globalPts.end(),0.0);
294	<
295	<	displs_[0] = 0;
296	<	/* Build a displacements array */
297	<	for (int i = 1; i < nproc_; i++){
556	<	displs_[i] = displs_[i-1] + NstoProc_[i-1];
557	<	}
558	<
559	<
560	<	int noffset = displs_[myrank_];
561	<	/* gather the potential hull */
562	<
563	<	MPI::COMM_WORLD.Allgatherv(&localPts[0],localPtArraySize,MPI::DOUBLE,&globalPts[0],&NstoProc_[0],&displs_[0],MPI::DOUBLE);
564	<	MPI::COMM_WORLD.Allgatherv(&localVel[0],localPtArraySize,MPI::DOUBLE,&globalVel[0],&NstoProc_[0],&displs_[0],MPI::DOUBLE);
565	<
566	<	/*
567	<	if (myrank_ == 0){
568	<	for (i = 0; i < globalPts.size(); i++){
569	<	std::cout << globalPts[i] << std::endl;
287	>	int index = 0;
288	>	FORALLvertices {
289	>	Vector3d point(vertex->point[0], vertex->point[1], vertex->point[2]);
290	>	if (index == 0) {
291	>	boxMax = point;
292	>	boxMin = point;
293	>	} else {
294	>	for (int i = 0; i < 3; i++) {
295	>	boxMax[i] = max(boxMax[i], point[i]);
296	>	boxMin[i] = min(boxMin[i], point[i]);
297	>	}
298		}
299	+	index++;
300		}
301	<	*/
302	<	// Free previous hull
301	>	boundingBox_ = Mat3x3d(0.0);
302	>	boundingBox_(0,0) = boxMax[0] - boxMin[0];
303	>	boundingBox_(1,1) = boxMax[1] - boxMin[1];
304	>	boundingBox_(2,2) = boxMax[2] - boxMin[2];
305	>
306		qh_freeqhull(!qh_ALL);
307		qh_memfreeshort(&curlong, &totlong);
308	<	if (curlong || totlong)
309	<	std::cerr << "qhull internal warning (main): did not free %d bytes of long memory (%d pieces) "
310	<	<< totlong << curlong << std::endl;
308	>	if (curlong || totlong) {
309	>	sprintf(painCave.errMsg, "ConvexHull: qhull internal warning:\n"
310	>	"\tdid not free %d bytes of long memory (%d pieces)",
311	>	totlong, curlong);
312	>	painCave.isFatal = 1;
313	>	simError();
314	>	}
315	>	}
316
317	<	if (qh_new_qhull(dim_, nglobalPts, &globalPts[0], ismalloc,
318	<	const_cast<char *>(options_.c_str()), NULL, stderr)){
582	<
583	<	sprintf(painCave.errMsg, "ConvexHull: Qhull failed to compute global convex hull");
584	<	painCave.isFatal = 1;
585	<	simError();
586	<
587	<	} //qh_new_qhull
588	<
589	<	#endif
590	<
591	<
592	<
593	<
594	<
595	<
596	<	unsigned int nf = qh num_facets;
597	<
598	<	/* Build Surface SD list first */
599	<
600	<	std::fill(isSurfaceID.begin(),isSurfaceID.end(),false);
601	<
602	<	FORALLfacets {
603	<
604	<	if (!facet->simplicial){
605	<	// should never happen with Qt
606	<	sprintf(painCave.errMsg, "ConvexHull: non-simplicaial facet detected");
607	<	painCave.isFatal = 1;
608	<	simError();
609	<	} //simplicical
610	<
611	<	Triangle* face = new Triangle();
612	<	Vector3d  V3dNormal(facet->normal[0],facet->normal[1],facet->normal[2]);
613	<	face->setNormal(V3dNormal);
614	<
615	<
616	<
617	<	RealType faceArea = 0.5*V3dNormal.length();
618	<	face->setArea(faceArea);
619	<
620	<
621	<	vertices = qh_facet3vertex(facet);
622	<
623	<	coordT *center = qh_getcenter(vertices);
624	<	Vector3d V3dCentroid(center[0], center[1], center[2]);
625	<	face->setCentroid(V3dCentroid);
626	<	Vector3d faceVel = V3Zero;
627	<	FOREACHvertex_(vertices){
628	<	id = qh_pointid(vertex->point);
629	<	int localindex = id;
317	>	void ConvexHull::printHull(const string& geomFileName) {
318	>
319		#ifdef IS_MPI
320	<	Vector3d velVector(globalVel[dim_ * id],globalVel[dim_ * id + 1], globalVel[dim_ * id + 1]);
632	<	faceVel = faceVel + velVector;
633	<	if (id >= noffset/3 && id < (noffset + localPtArraySize)/3 ){
634	<	localindex = localPtsMap[id-noffset/3];
635	<	#else
636	<	faceVel = faceVel + bodydoubles[localindex]->getVel();
320	>	if (worldRank == 0)  {
321		#endif
322	<	face->addVertex(bodydoubles[localindex]);
639	<	if( !isSurfaceID[id] ){
640	<	isSurfaceID[id] = true;
641	<	#ifdef IS_MPI
642	<
643	<	#endif
644	<
645	<	surfaceSDs_.push_back(bodydoubles[localindex]);
646	<
647	<	} //IF isSurfaceID
648	<
649	<	#ifdef IS_MPI
650	<
651	<	}else{
652	<	face->addVertex(NULL);
653	<	}
654	<	#endif
655	<	} //Foreachvertex
656	<	/*
657	<	if (!SETempty_(facet->coplanarset)){
658	<	FOREACHpoint_(facet->coplanarset){
659	<	id = qh_pointid(point);
660	<	surfaceSDs_.push_back(bodydoubles[id]);
661	<	}
662	<	}
663	<	*/
664	<	face->setFacetVelocity(faceVel/3.0);
665	<	Triangles_.push_back(face);
666	<	qh_settempfree(&vertices);
667	<
668	<	} //FORALLfacets
669	<
670	<	/*
671	<	std::cout << surfaceSDs_.size() << std::endl;
672	<	for (SD = surfaceSDs_.begin(); SD != surfaceSDs_.end(); ++SD){
673	<	Vector3d thisatom = (*SD)->getPos();
674	<	std::cout << "Au " << thisatom.x() << "  " << thisatom.y() << " " << thisatom.z() << std::endl;
675	<	}
676	<	*/
677	<
678	<
679	<
680	<	Ns_ = surfaceSDs_.size();
681	<	nTriangles_ = Triangles_.size();
322	>	FILE *newGeomFile;
323
324	<	qh_getarea(qh facet_list);
325	<	volume_ = qh totvol;
326	<	area_ = qh totarea;
324	>	//create new .md file based on old .md file
325	>	newGeomFile = fopen(geomFileName.c_str(), "w");
326	>	qh_findgood_all(qh facet_list);
327	>	for (int i = 0; i < qh_PRINTEND; i++)
328	>	qh_printfacets(newGeomFile, qh PRINTout[i], qh facet_list, NULL, !qh_ALL);
329
330	<
331	<
332	<	qh_freeqhull(!qh_ALL);
333	<	qh_memfreeshort(&curlong, &totlong);
691	<	if (curlong || totlong)
692	<	std::cerr << "qhull internal warning (main): did not free %d bytes of long memory (%d pieces) "
693	<	<< totlong << curlong << std::endl;
694	<
695	<
696	<
330	>	fclose(newGeomFile);
331	>	#ifdef IS_MPI
332	>	}
333	>	#endif
334		}
698	–
699	–
700	–
701	–	void ConvexHull::printHull(const std::string& geomFileName)
702	–	{
703	–
704	–	FILE *newGeomFile;
705	–
706	–	//create new .md file based on old .md file
707	–	newGeomFile = fopen(geomFileName.c_str(), "w");
708	–	qh_findgood_all(qh facet_list);
709	–	for (int i = 0; i < qh_PRINTEND; i++)
710	–	qh_printfacets(newGeomFile, qh PRINTout[i], qh facet_list, NULL, !qh_ALL);
711	–
712	–	fclose(newGeomFile);
713	–	}
335		#endif //QHULL
715	–	#endif //CGAL
716	–
717	–
718	–

Comparing:
trunk/src/math/ConvexHull.cpp (property svn:keywords), Revision 1307 by chuckv, Mon Oct 20 19:36:32 2008 UTC vs.
branches/development/src/math/ConvexHull.cpp (property svn:keywords), Revision 1858 by gezelter, Wed Apr 3 21:32:13 2013 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines