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 295 by tim, Mon Feb 7 19:13:18 2005 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
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
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).          
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"
44   #include "primitives/Molecule.hpp"
45 < namespace oopse {
45 > namespace OpenMD {
46  
47 < DistanceFinder::DistanceFinder(SimInfo* info) : info_(info) {
47 >  DistanceFinder::DistanceFinder(SimInfo* info) : info_(info) {
48  
49      nStuntDoubles_ = info_->getNGlobalAtoms() + info_->getNGlobalRigidBodies();
50      stuntdoubles_.resize(nStuntDoubles_);
# Line 58 | Line 59 | DistanceFinder::DistanceFinder(SimInfo* info) : info_(
59      
60      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
61          
62 <        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
63 <            stuntdoubles_[atom->getGlobalIndex()] = atom;
64 <        }
62 >      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
63 >        stuntdoubles_[atom->getGlobalIndex()] = atom;
64 >      }
65  
66 <        for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
67 <            stuntdoubles_[rb->getGlobalIndex()] = rb;
68 <        }
66 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
67 >        stuntdoubles_[rb->getGlobalIndex()] = rb;
68 >      }
69          
70      }    
71  
72 < }
72 >  }
73  
74 < BitSet DistanceFinder::find(const BitSet& bs, double distance) {
74 >  OpenMDBitSet DistanceFinder::find(const OpenMDBitSet& bs, RealType distance) {
75      StuntDouble * center;
76      Vector3d centerPos;
77      Snapshot* currSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
78 <    BitSet bsResult(nStuntDoubles_);
78 >    OpenMDBitSet bsResult(nStuntDoubles_);
79      assert(bsResult.size() == bs.size());
80 <    
81 <    for (int i = bs.nextOnBit(-1); i != -1; i = bs.nextOnBit(i)) {
82 <        center = stuntdoubles_[i];
83 <        centerPos = center->getPos();
84 <        for (int j = 0; j < stuntdoubles_.size(); ++j) {
85 <            Vector3d r =centerPos - stuntdoubles_[j]->getPos();
85 <            currSnapshot->wrapVector(r);
86 <            if (r.length() <= distance) {
87 <                bsResult.setBitOn(j);
88 <            }
89 <        }
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 (unsigned int j = 0; j < stuntdoubles_.size(); ++j) {
92 +        Vector3d r =centerPos - stuntdoubles_[j]->getPos();
93 +        currSnapshot->wrapVector(r);
94 +        if (r.length() <= distance) {
95 +          bsResult.setBitOn(j);
96 +        }
97 +      }
98 +    }
99  
100      return bsResult;
101 < }
101 >  }
102  
103   }

Comparing:
trunk/src/selection/DistanceFinder.cpp (property svn:keywords), Revision 295 by tim, Mon Feb 7 19:13:18 2005 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