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

Comparing branches/development/src/utils/MoLocator.cpp (file contents):
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC vs.
Revision 1769 by gezelter, Mon Jul 9 14:15:52 2012 UTC

# Line 73 | Line 73 | namespace OpenMD {
73      }
74      
75      Molecule::IntegrableObjectIterator ii;
76 <    StuntDouble* integrableObject;
76 >    StuntDouble* sd;
77      int i;
78 <    for (integrableObject = mol->beginIntegrableObject(ii), i = 0; integrableObject != NULL;
79 <         integrableObject = mol->nextIntegrableObject(ii), ++i) {
78 >    for (sd = mol->beginIntegrableObject(ii), i = 0; sd != NULL;
79 >         sd = mol->nextIntegrableObject(ii), ++i) {
80        
81        newCoor = rotMat * refCoords[i];
82        newCoor += offset;
83      
84 <      integrableObject->setPos(newCoor);
85 <      integrableObject->setVel(V3Zero);
84 >      sd->setPos(newCoor);
85 >      sd->setVel(V3Zero);
86        
87 <      if(integrableObject->isDirectional()){
88 <        integrableObject->setA(rotMat * integrableObject->getA());
89 <        integrableObject->setJ(V3Zero);  
87 >      if(sd->isDirectional()){
88 >        sd->setA(rotMat * sd->getA());
89 >        sd->setJ(V3Zero);  
90        }        
91      }
92    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines