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

Comparing:
trunk/src/selection/DistanceFinder.cpp (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/selection/DistanceFinder.cpp (file contents), Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
2 > * Copyright (c) 2005, 2010 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
5   * non-exclusive, royalty free, license to use, modify and
# Line 36 | Line 36
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).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include "selection/DistanceFinder.hpp"
# Line 76 | Line 77 | namespace OpenMD {
77      Snapshot* currSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
78      OpenMDBitSet bsResult(nStuntDoubles_);
79      assert(bsResult.size() == bs.size());
80 <    
80 >  
81 >    for (unsigned int j = 0; j < stuntdoubles_.size(); ++j) {
82 >      if (stuntdoubles_[j]->isRigidBody()) {
83 >        RigidBody* rb = static_cast<RigidBody*>(stuntdoubles_[j]);
84 >        rb->updateAtoms();
85 >      }
86 >    }
87 >  
88      for (int i = bs.firstOnBit(); i != -1; i = bs.nextOnBit(i)) {
89        center = stuntdoubles_[i];
90        centerPos = center->getPos();
91 <      for (int j = 0; j < stuntdoubles_.size(); ++j) {
91 >      for (unsigned int j = 0; j < stuntdoubles_.size(); ++j) {
92          Vector3d r =centerPos - stuntdoubles_[j]->getPos();
93          currSnapshot->wrapVector(r);
94          if (r.length() <= distance) {

Comparing:
trunk/src/selection/DistanceFinder.cpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/selection/DistanceFinder.cpp (property svn:keywords), Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines