ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/selection/HullFinder.cpp
(Generate patch)

Comparing:
trunk/src/selection/HullFinder.cpp (file contents), Revision 1412 by gezelter, Mon Mar 22 18:45:39 2010 UTC vs.
branches/development/src/selection/HullFinder.cpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include "selection/HullFinder.hpp"
# Line 81 | Line 82 | namespace OpenMD {
82          stuntdoubles_[rb->getGlobalIndex()] = rb;
83        }
84          
85 <    }    
86 <    surfaceMesh_ = new ConvexHull();    
85 >    }
86 > #ifdef HAVE_QHULL
87 >    surfaceMesh_ = new ConvexHull();
88 > #endif
89    }
90  
91    OpenMDBitSet HullFinder::findHull() {
92      StuntDouble* sd;
93      Snapshot* currSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
94      OpenMDBitSet bsResult(nStuntDoubles_);
95 <
95 > #ifdef HAVE_QHULL
96      surfaceMesh_->computeHull(localSites_);
97 + #else
98 +    sprintf( painCave.errMsg,
99 +             "HullFinder : Hull calculation is not possible without libqhull.\n"
100 +             "\tPlease rebuild OpenMD with qhull enabled.");
101 +      painCave.severity = OPENMD_ERROR;
102 +      painCave.isFatal = 1;
103 +      simError();
104 + #endif
105 +    
106      std::vector<Triangle> sMesh = surfaceMesh_->getMesh();
107      int nTriangles = sMesh.size();
108      // Loop over the mesh faces

Comparing:
trunk/src/selection/HullFinder.cpp (property svn:keywords), Revision 1412 by gezelter, Mon Mar 22 18:45:39 2010 UTC vs.
branches/development/src/selection/HullFinder.cpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines