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

Comparing branches/development/src/primitives/RigidBody.cpp (file contents):
Revision 1844 by gezelter, Wed Jan 30 14:43:08 2013 UTC vs.
Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC

# Line 35 | Line 35
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).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
# Line 290 | Line 290 | namespace OpenMD {
290  
291      for (unsigned int i = 0; i < atoms_.size(); i++) {
292        
293 +      atype = atoms_[i]->getAtomType();
294 +
295        afrc = atoms_[i]->getFrc();
296        apos = atoms_[i]->getPos();
297        rpos = apos - pos;
# Line 307 | Line 309 | namespace OpenMD {
309          atrq = atoms_[i]->getTrq();
310          trq += atrq;
311        }
312 +
313        if ((sl & DataStorage::dslElectricField) && (atype->isElectrostatic())) {
314          ef += atoms_[i]->getElectricField();
315          eCount++;
# Line 352 | Line 355 | namespace OpenMD {
355  
356        if (atoms_[i]->isDirectional()) {
357            
358 <        dAtom = (DirectionalAtom *) atoms_[i];
358 >        dAtom = dynamic_cast<DirectionalAtom *>(atoms_[i]);
359          dAtom->setA(refOrients_[i].transpose() * a);
360        }
361  
# Line 379 | Line 382 | namespace OpenMD {
382  
383        if (atoms_[i]->isDirectional()) {
384            
385 <        dAtom = (DirectionalAtom *) atoms_[i];
385 >        dAtom = dynamic_cast<DirectionalAtom *>(atoms_[i]);
386          dAtom->setA(refOrients_[i].transpose() * a, frame);
387        }
388  

Diff Legend

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