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 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC vs.
Revision 1931 by gezelter, Mon Aug 19 19:20:32 2013 UTC

# Line 56 | Line 56 | namespace OpenMD {
56  
57    SelectionEvaluator::SelectionEvaluator(SimInfo* si)
58      : info(si), nameFinder(info), distanceFinder(info), hullFinder(info),
59 <      indexFinder(info),
59 >      indexFinder(info), hasSurfaceArea_(false),
60        isLoaded_(false){    
61        nStuntDouble = info->getNGlobalAtoms() + info->getNGlobalRigidBodies();
62      }            
# Line 377 | Line 377 | namespace OpenMD {
377                                             float comparisonValue) {
378      RealType propertyValue = 0.0;
379      Vector3d pos;
380 +
381      switch (property) {
382      case Token::mass:
383        propertyValue = sd->getMass();
# Line 446 | Line 447 | namespace OpenMD {
447        match = propertyValue != comparisonValue;
448        break;
449      }
450 +
451      if (match)
452        bs.setBitOn(sd->getGlobalIndex());
453  
# Line 730 | Line 732 | namespace OpenMD {
732      OpenMDBitSet bs(nStuntDouble);
733      
734      bs = hullFinder.findHull();
735 <    
735 >    surfaceArea_ = hullFinder.getSurfaceArea();
736 >    hasSurfaceArea_ = true;
737      return bs;
738    }
739  
# Line 739 | Line 742 | namespace OpenMD {
742      OpenMDBitSet bs(nStuntDouble);
743      
744      bs = hullFinder.findHull(frame);
745 <    
745 >
746      return bs;
747    }
748  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines