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

Comparing branches/development/src/integrators/LangevinHullForceManager.cpp (file contents):
Revision 1866 by gezelter, Thu Apr 25 14:32:56 2013 UTC vs.
Revision 1875 by gezelter, Fri May 17 14:41:42 2013 UTC

# Line 174 | Line 174 | namespace OpenMD {
174  
175      // Compute surface Mesh
176      surfaceMesh_->computeHull(localSites_);
177    Snapshot* currSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
177    }  
178 +
179 +  LangevinHullForceManager::~LangevinHullForceManager() {
180 +    delete surfaceMesh_;
181 +    delete veloMunge;
182 +  }
183    
184    void LangevinHullForceManager::postCalculation(){
185    
186      int nTriangles, thisFacet;
187 <    RealType area, thisArea, thisMass;
187 >    RealType area, thisArea;
188      vector<Triangle> sMesh;
189      Triangle thisTriangle;
190      vector<Triangle>::iterator face;
# Line 196 | Line 200 | namespace OpenMD {
200  
201      // Compute surface Mesh
202      surfaceMesh_->computeHull(localSites_);
203 <    // Get total area and number of surface stunt doubles
200 <    area = surfaceMesh_->getArea();
203 >    // Get number of surface stunt doubles
204      sMesh = surfaceMesh_->getMesh();
205      nTriangles = sMesh.size();
206  
# Line 215 | Line 218 | namespace OpenMD {
218        unitNormal = thisTriangle.getUnitNormal();
219        centroid = thisTriangle.getCentroid();
220        facetVel = thisTriangle.getFacetVelocity();
218      thisMass = thisTriangle.getFacetMass();
221  
222        langevinForce = V3Zero;
223  
# Line 274 | Line 276 | namespace OpenMD {
276      // push these out to the other processors
277      
278   #ifdef IS_MPI
279 <    if (worldRank == 0) {
280 <      MPI::COMM_WORLD.Bcast(&gaussRand[0], nTriangles*3, MPI::REALTYPE, 0);
279 <    } else {
280 <      MPI::COMM_WORLD.Bcast(&gaussRand[0], nTriangles*3, MPI::REALTYPE, 0);
281 <    }
279 >    // Same command on all nodes:
280 >    MPI::COMM_WORLD.Bcast(&gaussRand[0], nTriangles*3, MPI::REALTYPE, 0);
281   #endif
282      
283      return gaussRand;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines