| 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).                         | 
| 39 | 
> | 
 * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010). | 
| 40 | 
> | 
 * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). | 
| 41 | 
  | 
 */ | 
| 42 | 
  | 
#include <algorithm> | 
| 43 | 
  | 
#include <math.h> | 
| 53 | 
  | 
  void RigidBody::setPrevA(const RotMat3x3d& a) { | 
| 54 | 
  | 
    ((snapshotMan_->getPrevSnapshot())->*storage_).aMat[localIndex_] = a; | 
| 55 | 
  | 
     | 
| 56 | 
< | 
    for (int i =0 ; i < atoms_.size(); ++i){ | 
| 56 | 
> | 
    for (unsigned int i = 0 ; i < atoms_.size(); ++i){ | 
| 57 | 
  | 
      if (atoms_[i]->isDirectional()) { | 
| 58 | 
  | 
        atoms_[i]->setPrevA(refOrients_[i].transpose() * a); | 
| 59 | 
  | 
      } | 
| 65 | 
  | 
  void RigidBody::setA(const RotMat3x3d& a) { | 
| 66 | 
  | 
    ((snapshotMan_->getCurrentSnapshot())->*storage_).aMat[localIndex_] = a; | 
| 67 | 
  | 
 | 
| 68 | 
< | 
    for (int i =0 ; i < atoms_.size(); ++i){ | 
| 68 | 
> | 
    for (unsigned int i = 0 ; i < atoms_.size(); ++i){ | 
| 69 | 
  | 
      if (atoms_[i]->isDirectional()) { | 
| 70 | 
  | 
        atoms_[i]->setA(refOrients_[i].transpose() * a); | 
| 71 | 
  | 
      } | 
| 74 | 
  | 
   | 
| 75 | 
  | 
  void RigidBody::setA(const RotMat3x3d& a, int snapshotNo) { | 
| 76 | 
  | 
    ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).aMat[localIndex_] = a; | 
| 77 | 
< | 
     | 
| 78 | 
< | 
    //((snapshotMan_->getSnapshot(snapshotNo))->*storage_).electroFrame[localIndex_] = a.transpose() * sU_;     | 
| 78 | 
< | 
     | 
| 79 | 
< | 
    for (int i =0 ; i < atoms_.size(); ++i){ | 
| 77 | 
> | 
         | 
| 78 | 
> | 
    for (unsigned int i = 0 ; i < atoms_.size(); ++i){ | 
| 79 | 
  | 
      if (atoms_[i]->isDirectional()) { | 
| 80 | 
  | 
        atoms_[i]->setA(refOrients_[i].transpose() * a, snapshotNo); | 
| 81 | 
  | 
      } | 
| 92 | 
  | 
    Vector3d force; | 
| 93 | 
  | 
    Vector3d torque; | 
| 94 | 
  | 
    Vector3d myEuler; | 
| 95 | 
< | 
    RealType phi, theta, psi; | 
| 95 | 
> | 
    RealType phi, theta; | 
| 96 | 
> | 
    // RealType psi; | 
| 97 | 
  | 
    RealType cphi, sphi, ctheta, stheta; | 
| 98 | 
  | 
    Vector3d ephi; | 
| 99 | 
  | 
    Vector3d etheta; | 
| 105 | 
  | 
     | 
| 106 | 
  | 
    phi = myEuler[0]; | 
| 107 | 
  | 
    theta = myEuler[1]; | 
| 108 | 
< | 
    psi = myEuler[2]; | 
| 108 | 
> | 
    // psi = myEuler[2]; | 
| 109 | 
  | 
     | 
| 110 | 
  | 
    cphi = cos(phi); | 
| 111 | 
  | 
    sphi = sin(phi); | 
| 118 | 
  | 
    ephi[1] = 0.0; | 
| 119 | 
  | 
    ephi[2] = 1.0; | 
| 120 | 
  | 
     | 
| 121 | 
< | 
    etheta[0] = -sphi; | 
| 122 | 
< | 
    etheta[1] =  cphi; | 
| 121 | 
> | 
    //etheta[0] = -sphi; | 
| 122 | 
> | 
    //etheta[1] =  cphi; | 
| 123 | 
> | 
    //etheta[2] =  0.0; | 
| 124 | 
> | 
     | 
| 125 | 
> | 
    etheta[0] = cphi; | 
| 126 | 
> | 
    etheta[1] = sphi; | 
| 127 | 
  | 
    etheta[2] =  0.0; | 
| 128 | 
  | 
     | 
| 129 | 
  | 
    epsi[0] = stheta * cphi; | 
| 226 | 
  | 
    Vector3d apos; | 
| 227 | 
  | 
    Vector3d rpos; | 
| 228 | 
  | 
    Vector3d frc(0.0); | 
| 229 | 
< | 
    Vector3d trq(0.0);     | 
| 229 | 
> | 
    Vector3d trq(0.0); | 
| 230 | 
> | 
    Vector3d ef(0.0); | 
| 231 | 
  | 
    Vector3d pos = this->getPos(); | 
| 232 | 
< | 
    for (int i = 0; i < atoms_.size(); i++) { | 
| 232 | 
> | 
    AtomType* atype; | 
| 233 | 
> | 
    int eCount = 0; | 
| 234 | 
> | 
     | 
| 235 | 
> | 
    int sl = ((snapshotMan_->getCurrentSnapshot())->*storage_).getStorageLayout(); | 
| 236 | 
> | 
     | 
| 237 | 
> | 
    for (unsigned int i = 0; i < atoms_.size(); i++) { | 
| 238 | 
  | 
 | 
| 239 | 
+ | 
      atype = atoms_[i]->getAtomType(); | 
| 240 | 
+ | 
 | 
| 241 | 
  | 
      afrc = atoms_[i]->getFrc(); | 
| 242 | 
  | 
      apos = atoms_[i]->getPos(); | 
| 243 | 
  | 
      rpos = apos - pos; | 
| 254 | 
  | 
      if (atoms_[i]->isDirectional()) { | 
| 255 | 
  | 
        atrq = atoms_[i]->getTrq(); | 
| 256 | 
  | 
        trq += atrq; | 
| 257 | 
< | 
      }       | 
| 257 | 
> | 
      } | 
| 258 | 
> | 
 | 
| 259 | 
> | 
      if ((sl & DataStorage::dslElectricField) && (atype->isElectrostatic())) { | 
| 260 | 
> | 
        ef += atoms_[i]->getElectricField(); | 
| 261 | 
> | 
        eCount++; | 
| 262 | 
> | 
      } | 
| 263 | 
  | 
    }          | 
| 264 | 
  | 
    addFrc(frc); | 
| 265 | 
  | 
    addTrq(trq);     | 
| 266 | 
+ | 
 | 
| 267 | 
+ | 
    if (sl & DataStorage::dslElectricField)  { | 
| 268 | 
+ | 
      ef /= eCount; | 
| 269 | 
+ | 
      setElectricField(ef); | 
| 270 | 
+ | 
    } | 
| 271 | 
+ | 
 | 
| 272 | 
  | 
  } | 
| 273 | 
  | 
 | 
| 274 | 
  | 
  Mat3x3d RigidBody::calcForcesAndTorquesAndVirial() { | 
| 278 | 
  | 
    Vector3d rpos; | 
| 279 | 
  | 
    Vector3d dfrc; | 
| 280 | 
  | 
    Vector3d frc(0.0); | 
| 281 | 
< | 
    Vector3d trq(0.0);     | 
| 281 | 
> | 
    Vector3d trq(0.0); | 
| 282 | 
> | 
    Vector3d ef(0.0); | 
| 283 | 
> | 
    AtomType* atype; | 
| 284 | 
> | 
    int eCount = 0; | 
| 285 | 
> | 
 | 
| 286 | 
  | 
    Vector3d pos = this->getPos(); | 
| 287 | 
  | 
    Mat3x3d tau_(0.0); | 
| 288 | 
  | 
 | 
| 289 | 
< | 
    for (int i = 0; i < atoms_.size(); i++) { | 
| 289 | 
> | 
    int sl = ((snapshotMan_->getCurrentSnapshot())->*storage_).getStorageLayout(); | 
| 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; | 
| 309 | 
  | 
        atrq = atoms_[i]->getTrq(); | 
| 310 | 
  | 
        trq += atrq; | 
| 311 | 
  | 
      } | 
| 312 | 
+ | 
 | 
| 313 | 
+ | 
      if ((sl & DataStorage::dslElectricField) && (atype->isElectrostatic())) { | 
| 314 | 
+ | 
        ef += atoms_[i]->getElectricField(); | 
| 315 | 
+ | 
        eCount++; | 
| 316 | 
+ | 
      } | 
| 317 | 
  | 
       | 
| 318 | 
  | 
      tau_(0,0) -= rpos[0]*afrc[0]; | 
| 319 | 
  | 
      tau_(0,1) -= rpos[0]*afrc[1]; | 
| 328 | 
  | 
    } | 
| 329 | 
  | 
    addFrc(frc); | 
| 330 | 
  | 
    addTrq(trq); | 
| 331 | 
+ | 
 | 
| 332 | 
+ | 
    if (sl & DataStorage::dslElectricField) { | 
| 333 | 
+ | 
      ef /= eCount; | 
| 334 | 
+ | 
      setElectricField(ef); | 
| 335 | 
+ | 
    } | 
| 336 | 
+ | 
 | 
| 337 | 
  | 
    return tau_; | 
| 338 | 
  | 
  } | 
| 339 | 
  | 
 | 
| 413 | 
  | 
 | 
| 414 | 
  | 
 | 
| 415 | 
  | 
    Vector3d velRot;         | 
| 416 | 
< | 
    for (int i =0 ; i < refCoords_.size(); ++i) { | 
| 416 | 
> | 
    for (unsigned int i = 0 ; i < refCoords_.size(); ++i) { | 
| 417 | 
  | 
      atoms_[i]->setVel(rbVel + mat * refCoords_[i]); | 
| 418 | 
  | 
    } | 
| 419 | 
  | 
 | 
| 442 | 
  | 
 | 
| 443 | 
  | 
 | 
| 444 | 
  | 
    Vector3d velRot;         | 
| 445 | 
< | 
    for (int i =0 ; i < refCoords_.size(); ++i) { | 
| 445 | 
> | 
    for (unsigned int i = 0 ; i < refCoords_.size(); ++i) { | 
| 446 | 
  | 
      atoms_[i]->setVel(rbVel + mat * refCoords_[i], frame); | 
| 447 | 
  | 
    } | 
| 448 | 
  | 
 |