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

Comparing trunk/src/selection/HullFinder.cpp (file contents):
Revision 1801 by gezelter, Mon Oct 1 18:21:15 2012 UTC vs.
Revision 1903 by gezelter, Tue Jul 16 18:58:08 2013 UTC

# Line 35 | Line 35
35   *                                                                      
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).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
# Line 88 | Line 88 | namespace OpenMD {
88   #endif
89    }
90  
91 +  HullFinder::~HullFinder() {
92 +    delete surfaceMesh_;
93 +  }
94 +
95    OpenMDBitSet HullFinder::findHull() {
92 –    Snapshot* currSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
96      OpenMDBitSet bsResult(nStuntDoubles_);
97   #ifdef HAVE_QHULL
98      surfaceMesh_->computeHull(localSites_);
# Line 97 | Line 100 | namespace OpenMD {
100      sprintf( painCave.errMsg,
101               "HullFinder : Hull calculation is not possible without libqhull.\n"
102               "\tPlease rebuild OpenMD with qhull enabled.");
103 +    painCave.severity = OPENMD_ERROR;
104 +    painCave.isFatal = 1;
105 +    simError();
106 + #endif
107 +    
108 +    std::vector<Triangle> sMesh = surfaceMesh_->getMesh();
109 +    // Loop over the mesh faces
110 +    std::vector<Triangle>::iterator face;
111 +    std::vector<StuntDouble*>::iterator vertex;
112 +
113 +    // This will work in parallel because the triangles returned by the mesh
114 +    // have a NULL stuntDouble if this processor doesn't own the
115 +    
116 +    for (face = sMesh.begin(); face != sMesh.end(); ++face) {
117 +      Triangle thisTriangle = *face;
118 +      std::vector<StuntDouble*> vertexSDs = thisTriangle.getVertices();
119 +      for (vertex = vertexSDs.begin(); vertex != vertexSDs.end(); ++vertex) {
120 +        if ((*vertex) != NULL) {
121 +          bsResult.setBitOn((*vertex)->getGlobalIndex());          
122 +        }
123 +      }
124 +    }
125 +    return bsResult;
126 +  }
127 +
128 +  OpenMDBitSet HullFinder::findHull(int frame) {
129 +    OpenMDBitSet bsResult(nStuntDoubles_);
130 + #ifdef HAVE_QHULL
131 +    surfaceMesh_->computeHull(localSites_);
132 + #else
133 +    sprintf( painCave.errMsg,
134 +             "HullFinder : Hull calculation is not possible without libqhull.\n"
135 +             "\tPlease rebuild OpenMD with qhull enabled.");
136        painCave.severity = OPENMD_ERROR;
137        painCave.isFatal = 1;
138        simError();
139   #endif
140      
141      std::vector<Triangle> sMesh = surfaceMesh_->getMesh();
106 –    int nTriangles = sMesh.size();
142      // Loop over the mesh faces
143      std::vector<Triangle>::iterator face;
144      std::vector<StuntDouble*>::iterator vertex;
# Line 120 | Line 155 | namespace OpenMD {
155          }
156        }
157      }
158 +    surfaceArea_ = surfaceMesh_->getArea();
159      return bsResult;
160    }
161  

Diff Legend

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