| 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 |  | */ | 
| 44 |  | namespace OpenMD { | 
| 45 |  |  | 
| 46 |  | IndexFinder::IndexFinder(SimInfo* info) : info_(info){ | 
| 47 | < | nStuntDoubles_ = info_->getNGlobalAtoms() + info_->getNGlobalRigidBodies(); | 
| 48 | < | bitSets_.resize(info_->getNGlobalMolecules()); | 
| 47 | > | nObjects_.push_back(info_->getNGlobalAtoms()+info_->getNGlobalRigidBodies()); | 
| 48 | > | nObjects_.push_back(info_->getNGlobalBonds()); | 
| 49 | > | nObjects_.push_back(info_->getNGlobalBends()); | 
| 50 | > | nObjects_.push_back(info_->getNGlobalTorsions()); | 
| 51 | > | nObjects_.push_back(info_->getNGlobalInversions()); | 
| 52 | > |  | 
| 53 | > | selectionSets_.resize(info_->getNGlobalMolecules()); | 
| 54 |  | init(); | 
| 55 |  | } | 
| 56 |  |  | 
| 57 |  | void IndexFinder::init() { | 
| 58 |  |  | 
| 59 |  | SimInfo::MoleculeIterator mi; | 
| 55 | – | Molecule* mol; | 
| 60 |  | Molecule::AtomIterator ai; | 
| 57 | – | Atom* atom; | 
| 61 |  | Molecule::RigidBodyIterator rbIter; | 
| 62 | + | Molecule::BondIterator bondIter; | 
| 63 | + | Molecule::BendIterator bendIter; | 
| 64 | + | Molecule::TorsionIterator torsionIter; | 
| 65 | + | Molecule::InversionIterator inversionIter; | 
| 66 | + |  | 
| 67 | + | Molecule* mol; | 
| 68 | + | Atom* atom; | 
| 69 |  | RigidBody* rb; | 
| 70 | + | Bond* bond; | 
| 71 | + | Bend* bend; | 
| 72 | + | Torsion* torsion; | 
| 73 | + | Inversion* inversion; | 
| 74 |  |  | 
| 75 |  | for (mol = info_->beginMolecule(mi); mol != NULL; | 
| 76 |  | mol = info_->nextMolecule(mi)) { | 
| 77 |  |  | 
| 78 | < | OpenMDBitSet bs(nStuntDoubles_); | 
| 78 | > | SelectionSet ss(nObjects_); | 
| 79 | > |  | 
| 80 |  | for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) { | 
| 81 | < | bs.setBitOn(atom->getGlobalIndex()); | 
| 81 | > | ss.bitsets_[STUNTDOUBLE].setBitOn(atom->getGlobalIndex()); | 
| 82 |  | } | 
| 83 |  | for (rb = mol->beginRigidBody(rbIter); rb != NULL; | 
| 84 |  | rb = mol->nextRigidBody(rbIter)) { | 
| 85 | < | bs.setBitOn(rb->getGlobalIndex()); | 
| 85 | > | ss.bitsets_[STUNTDOUBLE].setBitOn(rb->getGlobalIndex()); | 
| 86 |  | } | 
| 87 | < | bitSets_[mol->getGlobalIndex()] = bs; | 
| 87 | > | for (bond = mol->beginBond(bondIter); bond != NULL; | 
| 88 | > | bond = mol->nextBond(bondIter)) { | 
| 89 | > | ss.bitsets_[BOND].setBitOn(bond->getGlobalIndex()); | 
| 90 | > | } | 
| 91 | > | for (bend = mol->beginBend(bendIter); bend != NULL; | 
| 92 | > | bend = mol->nextBend(bendIter)) { | 
| 93 | > | ss.bitsets_[BEND].setBitOn(bend->getGlobalIndex()); | 
| 94 | > | } | 
| 95 | > | for (torsion = mol->beginTorsion(torsionIter); torsion != NULL; | 
| 96 | > | torsion = mol->nextTorsion(torsionIter)) { | 
| 97 | > | ss.bitsets_[TORSION].setBitOn(torsion->getGlobalIndex()); | 
| 98 | > | } | 
| 99 | > | for (inversion = mol->beginInversion(inversionIter); inversion != NULL; | 
| 100 | > | inversion = mol->nextInversion(inversionIter)) { | 
| 101 | > | ss.bitsets_[INVERSION].setBitOn(inversion->getGlobalIndex()); | 
| 102 | > | } | 
| 103 | > |  | 
| 104 | > | selectionSets_[mol->getGlobalIndex()] = ss; | 
| 105 |  | } | 
| 106 |  | } | 
| 107 |  |  | 
| 108 | < | OpenMDBitSet IndexFinder::find(int molIndex){ | 
| 109 | < | return bitSets_[molIndex]; | 
| 108 | > | SelectionSet IndexFinder::find(int molIndex){ | 
| 109 | > | return selectionSets_[molIndex]; | 
| 110 |  | } | 
| 111 |  |  | 
| 112 | < | OpenMDBitSet IndexFinder::find(int begMolIndex, int endMolIndex){ | 
| 113 | < | OpenMDBitSet bs(nStuntDoubles_); | 
| 112 | > | SelectionSet IndexFinder::find(int begMolIndex, int endMolIndex){ | 
| 113 | > | SelectionSet ss(nObjects_); | 
| 114 |  |  | 
| 115 |  | for (int i = begMolIndex; i < endMolIndex; ++i) { | 
| 116 | < | bs |= bitSets_[i]; | 
| 116 | > | ss |= selectionSets_[i]; | 
| 117 |  | } | 
| 118 | < | return bs; | 
| 118 | > | return ss; | 
| 119 |  | } | 
| 120 |  | } | 
| 121 |  |  |