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

Comparing trunk/src/selection/SelectionEvaluator.cpp (file contents):
Revision 1800 by gezelter, Wed Aug 22 02:28:28 2012 UTC vs.
Revision 1801 by gezelter, Mon Oct 1 18:21:15 2012 UTC

# Line 159 | Line 159 | namespace OpenMD {
159        case Token::expressionEnd:
160          break;
161        case Token::all:
162 <        bs = OpenMDBitSet(nStuntDouble);
163 <        bs.setAll();
162 >        bs = allInstruction();
163          stack.push(bs);            
164          break;
165        case Token::none:
# Line 446 | Line 445 | namespace OpenMD {
445  
446      return bs;
447    }
448 +
449 +  OpenMDBitSet SelectionEvaluator::allInstruction() {
450 +    OpenMDBitSet bs(nStuntDouble);
451 +
452 +    SimInfo::MoleculeIterator mi;
453 +    Molecule* mol;
454 +    Molecule::AtomIterator ai;
455 +    Atom* atom;
456 +    Molecule::RigidBodyIterator rbIter;
457 +    RigidBody* rb;
458 +
459 +    // Doing the loop insures that we're actually on this processor.
460 +
461 +    for (mol = info->beginMolecule(mi); mol != NULL;
462 +         mol = info->nextMolecule(mi)) {
463  
464 +      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
465 +        bs.setBitOn(atom->getGlobalIndex());
466 +      }
467 +    
468 +      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
469 +           rb = mol->nextRigidBody(rbIter)) {
470 +        bs.setBitOn(rb->getGlobalIndex());
471 +      }
472 +    }
473  
474 +    return bs;
475 +  }
476 +
477    OpenMDBitSet SelectionEvaluator::hull() {
478      OpenMDBitSet bs(nStuntDouble);
479      
# Line 456 | Line 482 | namespace OpenMD {
482      return bs;
483    }
484  
459
460
485    RealType SelectionEvaluator::getCharge(Atom* atom) {
486      RealType charge =0.0;
487      AtomType* atomType = atom->getAtomType();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines