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

Comparing trunk/src/selection/DistanceFinder.cpp (file contents):
Revision 1801 by gezelter, Mon Oct 1 18:21:15 2012 UTC vs.
Revision 1811 by gezelter, Fri Nov 16 15:12:21 2012 UTC

# Line 42 | Line 42
42  
43   #include "selection/DistanceFinder.hpp"
44   #include "primitives/Molecule.hpp"
45 < namespace OpenMD {
45 > #ifdef IS_MPI
46 > #include <mpi.h>
47 > #endif
48  
49 + namespace OpenMD {
50 +  
51    DistanceFinder::DistanceFinder(SimInfo* info) : info_(info) {
52 <
52 >    
53      nStuntDoubles_ = info_->getNGlobalAtoms() + info_->getNGlobalRigidBodies();
54      stuntdoubles_.resize(nStuntDoubles_);
55      
# Line 55 | Line 59 | namespace OpenMD {
59      Atom* atom;
60      Molecule::RigidBodyIterator rbIter;
61      RigidBody* rb;
58
62      
63 +    
64      for (mol = info_->beginMolecule(mi); mol != NULL;
65           mol = info_->nextMolecule(mi)) {
66          
# Line 76 | Line 80 | namespace OpenMD {
80      StuntDouble * center;
81      Vector3d centerPos;
82      Snapshot* currSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
83 <    OpenMDBitSet bsResult(nStuntDoubles_);
83 >    OpenMDBitSet bsResult(nStuntDoubles_);  
84      assert(bsResult.size() == bs.size());
85 <  
85 >
86 > #ifdef IS_MPI
87 >    int mol;
88 >    int proc;
89 >    RealType data[3];
90 >    int worldRank = MPI::COMM_WORLD.Get_rank();
91 > #endif
92 >
93      for (unsigned int j = 0; j < stuntdoubles_.size(); ++j) {
94        if (stuntdoubles_[j]->isRigidBody()) {
95          RigidBody* rb = static_cast<RigidBody*>(stuntdoubles_[j]);
96          rb->updateAtoms();
97        }
98      }
99 <  
100 <    // This will fail in parallel because i might not be on this processor.
99 >      
100 >    OpenMDBitSet bsTemp(nStuntDoubles_);
101 >    bsTemp = bs;
102 >    bsTemp.parallelReduce();
103  
104 <    for (int i = bs.firstOnBit(); i != -1; i = bs.nextOnBit(i)) {
104 >    for (int i = bsTemp.firstOnBit(); i != -1; i = bsTemp.nextOnBit(i)) {
105 >
106 >      // Now, if we own stuntdouble i, we can use the position, but in
107 >      // parallel, we'll need to let everyone else know what that
108 >      // position is!
109 >
110 > #ifdef IS_MPI
111 >      mol = info_->getGlobalMolMembership(i);
112 >      proc = info_->getMolToProc(mol);
113 >    
114 >      if (proc == worldRank) {
115 >        center = stuntdoubles_[i];
116 >        centerPos = center->getPos();
117 >        data[0] = centerPos.x();
118 >        data[1] = centerPos.y();
119 >        data[2] = centerPos.z();          
120 >        MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc);
121 >      } else {
122 >        MPI::COMM_WORLD.Bcast(data, 3, MPI::REALTYPE, proc);
123 >        centerPos = Vector3d(data);
124 >      }
125 > #else
126        center = stuntdoubles_[i];
127        centerPos = center->getPos();
128 + #endif
129 +      
130        for (unsigned int j = 0; j < stuntdoubles_.size(); ++j) {
131          Vector3d r =centerPos - stuntdoubles_[j]->getPos();
132          currSnapshot->wrapVector(r);
# Line 99 | Line 135 | namespace OpenMD {
135          }
136        }
137      }
102
138      return bsResult;
139    }
105
140   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines