ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/primitives/CutoffGroup.hpp
(Generate patch)

Comparing branches/development/src/primitives/CutoffGroup.hpp (file contents):
Revision 1540 by gezelter, Mon Jan 17 21:34:36 2011 UTC vs.
Revision 1551 by gezelter, Thu Apr 28 18:38:21 2011 UTC

# Line 53 | Line 53 | namespace OpenMD {
53      CutoffGroup() :  snapshotMan_(NULL) {
54  
55        storage_ = &Snapshot::cgData;
56 – #ifdef IS_MPI
57 –      iStorage_ = &Snapshot::cgIData;
58 –      jStorage_ = &Snapshot::cgJData;
59 – #endif
56        haveTotalMass = false;
57        totalMass = 0.0;
58      }
# Line 128 | Line 124 | namespace OpenMD {
124      }
125  
126  
127 <    /**
132 <     * Returns the current position of this cutoffGroup for the outer
133 <     * iteration over the cutoff groups.  For Force decomposition,
134 <     * this is the position of the cutoff groups ordered by row index.
135 <     * For serial calculations, this is just the position of the
136 <     * cutoff group.
137 <     */    
138 <    Vector3d getPosI() {
139 < #ifdef IS_MPI
140 <      return ((snapshotMan_->getCurrentSnapshot())->*iStorage_).position[iIndex_];
141 < #else
127 >    Vector3d getPos() {
128        return ((snapshotMan_->getCurrentSnapshot())->*storage_).position[localIndex_];      
143 – #endif
129      }
145 –
146 –    /**
147 –     * Returns the current position of this cutoffGroup for the inner
148 –     * iteration over the cutoff groups.  For Force decomposition,
149 –     * this is the position of the cutoff groups ordered by column
150 –     * index.  For serial calculations, this is just the position of
151 –     * the cutoff group.
152 –     */    
153 –    Vector3d getPosJ() {
154 – #ifdef IS_MPI
155 –      return ((snapshotMan_->getCurrentSnapshot())->*jStorage_).position[jIndex_];
156 – #else
157 –      return ((snapshotMan_->getCurrentSnapshot())->*storage_).position[localIndex_];      
158 – #endif
159 –    }
130      
131      int getNumAtom() {
132        return cutoffAtomList.size();
# Line 196 | Line 166 | namespace OpenMD {
166      int localIndex_;
167      DataStoragePointer storage_;
168      SnapshotManager* snapshotMan_;
199 – #ifdef IS_MPI
200 –    int iIndex_;
201 –    int jIndex_;
202 –    DataStoragePointer iStorage_;
203 –    DataStoragePointer jStorage_;
204 – #endif
169  
170    };  
171   } //end namespace OpenMD

Diff Legend

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