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 358 by tim, Thu Feb 17 15:18:36 2005 UTC vs.
Revision 1434 by chuckv, Wed Apr 14 14:41:33 2010 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   #include "selection/DistanceFinder.hpp"
43   #include "primitives/Molecule.hpp"
44 < namespace oopse {
44 > namespace OpenMD {
45  
46 < DistanceFinder::DistanceFinder(SimInfo* info) : info_(info) {
46 >  DistanceFinder::DistanceFinder(SimInfo* info) : info_(info) {
47  
48      nStuntDoubles_ = info_->getNGlobalAtoms() + info_->getNGlobalRigidBodies();
49      stuntdoubles_.resize(nStuntDoubles_);
# Line 58 | Line 58 | DistanceFinder::DistanceFinder(SimInfo* info) : info_(
58      
59      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
60          
61 <        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
62 <            stuntdoubles_[atom->getGlobalIndex()] = atom;
63 <        }
61 >      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
62 >        stuntdoubles_[atom->getGlobalIndex()] = atom;
63 >      }
64  
65 <        for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
66 <            stuntdoubles_[rb->getGlobalIndex()] = rb;
67 <        }
65 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
66 >        stuntdoubles_[rb->getGlobalIndex()] = rb;
67 >      }
68          
69      }    
70  
71 < }
71 >  }
72  
73 < BitSet DistanceFinder::find(const BitSet& bs, double distance) {
73 >  OpenMDBitSet DistanceFinder::find(const OpenMDBitSet& bs, RealType distance) {
74      StuntDouble * center;
75      Vector3d centerPos;
76      Snapshot* currSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
77 <    BitSet bsResult(nStuntDoubles_);
77 >    OpenMDBitSet bsResult(nStuntDoubles_);
78      assert(bsResult.size() == bs.size());
79 <    
79 >  
80 >    for (int j = 0; j < stuntdoubles_.size(); ++j) {
81 >      if (stuntdoubles_[j]->isRigidBody()) {
82 >        RigidBody* rb = static_cast<RigidBody*>(stuntdoubles_[j]);
83 >        rb->updateAtoms();
84 >      }
85 >    }
86 >  
87      for (int i = bs.firstOnBit(); i != -1; i = bs.nextOnBit(i)) {
88 <        center = stuntdoubles_[i];
89 <        centerPos = center->getPos();
90 <        for (int j = 0; j < stuntdoubles_.size(); ++j) {
91 <            Vector3d r =centerPos - stuntdoubles_[j]->getPos();
92 <            currSnapshot->wrapVector(r);
93 <            if (r.length() <= distance) {
94 <                bsResult.setBitOn(j);
95 <            }
96 <        }
88 >      center = stuntdoubles_[i];
89 >      centerPos = center->getPos();
90 >      for (int j = 0; j < stuntdoubles_.size(); ++j) {
91 >        Vector3d r =centerPos - stuntdoubles_[j]->getPos();
92 >        currSnapshot->wrapVector(r);
93 >        if (r.length() <= distance) {
94 >          bsResult.setBitOn(j);
95 >        }
96 >      }
97      }
98  
99      return bsResult;
100 < }
100 >  }
101  
102   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines