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 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

# Line 81 | Line 81 | namespace OpenMD {
81          stuntdoubles_[rb->getGlobalIndex()] = rb;
82        }
83          
84 <    }    
85 <    surfaceMesh_ = new ConvexHull();    
84 >    }
85 > #ifdef HAVE_QHULL
86 >    surfaceMesh_ = new ConvexHull();
87 > #endif
88    }
89  
90    OpenMDBitSet HullFinder::findHull() {
91      StuntDouble* sd;
92      Snapshot* currSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
93      OpenMDBitSet bsResult(nStuntDoubles_);
94 <
94 > #ifdef HAVE_QHULL
95      surfaceMesh_->computeHull(localSites_);
96 + #else
97 +    sprintf( painCave.errMsg,
98 +             "HullFinder error: Hull calculation is not possible without libqhull.\n",
99 +             "Please rebuild OpenMD with qhull enabled.");
100 +      painCave.severity = OPENMD_ERROR;
101 +      painCave.isFatal = 1;
102 +      simError();
103 + #endif
104 +    
105      std::vector<Triangle> sMesh = surfaceMesh_->getMesh();
106      int nTriangles = sMesh.size();
107      // 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 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines