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

Comparing branches/development/src/selection/IndexFinder.cpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1803 by gezelter, Wed Oct 3 14:20:07 2012 UTC

# Line 43 | Line 43 | namespace OpenMD {
43   #include "primitives/Molecule.hpp"
44   namespace OpenMD {
45  
46
47
46    IndexFinder::IndexFinder(SimInfo* info) : info_(info){
47      nStuntDoubles_ = info_->getNGlobalAtoms() + info_->getNGlobalRigidBodies();
48      bitSets_.resize(info_->getNGlobalMolecules());
49      init();
50    }
51  
54
52    void IndexFinder::init() {
53  
54      SimInfo::MoleculeIterator mi;
# Line 61 | Line 58 | namespace OpenMD {
58      Molecule::RigidBodyIterator rbIter;
59      RigidBody* rb;
60      
61 <    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
61 >    for (mol = info_->beginMolecule(mi); mol != NULL;
62 >         mol = info_->nextMolecule(mi)) {
63            
64        OpenMDBitSet bs(nStuntDoubles_);
65        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
66          bs.setBitOn(atom->getGlobalIndex());
67        }
68 <
69 <      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
68 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
69 >           rb = mol->nextRigidBody(rbIter)) {
70          bs.setBitOn(rb->getGlobalIndex());
71        }
74
72        bitSets_[mol->getGlobalIndex()] = bs;
73 <    }    
77 <
73 >    }
74    }
75  
76    OpenMDBitSet IndexFinder::find(int molIndex){
# Line 86 | Line 82 | namespace OpenMD {
82          
83      for (int i = begMolIndex; i < endMolIndex; ++i) {
84        bs |= bitSets_[i];
85 <    }
90 <    
85 >    }    
86      return bs;
87    }
93
94
88   }
89  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines