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

Comparing:
trunk/src/primitives/RigidBody.cpp (file contents), Revision 1211 by gezelter, Wed Jan 23 16:38:22 2008 UTC vs.
branches/development/src/primitives/RigidBody.cpp (file contents), Revision 1842 by gezelter, Tue Jan 29 19:10:04 2013 UTC

# Line 6 | Line 6
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]  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>
44   #include "primitives/RigidBody.hpp"
45   #include "utils/simError.h"
46   #include "utils/NumericConstant.hpp"
47 < namespace oopse {
47 > namespace OpenMD {
48    
49    RigidBody::RigidBody() : StuntDouble(otRigidBody, &Snapshot::rigidbodyData),
50                             inertiaTensor_(0.0){    
# Line 52 | Line 53 | namespace oopse {
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        }
# Line 64 | Line 65 | namespace oopse {
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        }
# Line 73 | Line 74 | namespace oopse {
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        }
# Line 93 | Line 92 | namespace oopse {
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;
# Line 105 | Line 105 | namespace oopse {
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);
# Line 118 | Line 118 | namespace oopse {
118      ephi[1] = 0.0;
119      ephi[2] = 1.0;
120      
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;
127 >    etheta[2] =  0.0;
128      
129      epsi[0] = stheta * cphi;
130      epsi[1] = stheta * sphi;
# Line 193 | Line 197 | namespace oopse {
197          
198      int nLinearAxis = 0;
199      for (int i = 0; i < 3; i++) {    
200 <      if (fabs(evals[i]) < oopse::epsilon) {
200 >      if (fabs(evals[i]) < OpenMD::epsilon) {
201          linear_ = true;
202          linearAxis_ = i;
203          ++ nLinearAxis;
# Line 203 | Line 207 | namespace oopse {
207      if (nLinearAxis > 1) {
208        sprintf( painCave.errMsg,
209                 "RigidBody error.\n"
210 <               "\tOOPSE found more than one axis in this rigid body with a vanishing \n"
210 >               "\tOpenMD found more than one axis in this rigid body with a vanishing \n"
211                 "\tmoment of inertia.  This can happen in one of three ways:\n"
212                 "\t 1) Only one atom was specified, or \n"
213                 "\t 2) All atoms were specified at the same location, or\n"
# Line 222 | Line 226 | namespace oopse {
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();
227    for (int i = 0; i < atoms_.size(); i++) {
232  
233 +    int sl = ((snapshotMan_->getCurrentSnapshot())->*storage_).getStorageLayout();
234 +
235 +    for (unsigned int i = 0; i < atoms_.size(); i++) {
236 +
237        afrc = atoms_[i]->getFrc();
238        apos = atoms_[i]->getPos();
239        rpos = apos - pos;
# Line 242 | Line 250 | namespace oopse {
250        if (atoms_[i]->isDirectional()) {
251          atrq = atoms_[i]->getTrq();
252          trq += atrq;
253 <      }      
253 >      }
254 >
255 >      if (sl & DataStorage::dslElectricField) {
256 >        ef += atoms_[i]->getElectricField();
257 >      }
258      }        
259      addFrc(frc);
260      addTrq(trq);    
261 +
262 +    if (sl & DataStorage::dslElectricField) {
263 +      ef /= atoms_.size();
264 +      setElectricField(ef);
265 +    }
266 +
267    }
268  
269    Mat3x3d RigidBody::calcForcesAndTorquesAndVirial() {
# Line 255 | Line 273 | namespace oopse {
273      Vector3d rpos;
274      Vector3d dfrc;
275      Vector3d frc(0.0);
276 <    Vector3d trq(0.0);    
276 >    Vector3d trq(0.0);
277 >    Vector3d ef(0.0);
278 >    
279      Vector3d pos = this->getPos();
280      Mat3x3d tau_(0.0);
281  
282 <    for (int i = 0; i < atoms_.size(); i++) {
282 >    int sl = ((snapshotMan_->getCurrentSnapshot())->*storage_).getStorageLayout();
283 >
284 >    for (unsigned int i = 0; i < atoms_.size(); i++) {
285        
286        afrc = atoms_[i]->getFrc();
287        apos = atoms_[i]->getPos();
# Line 278 | Line 300 | namespace oopse {
300          atrq = atoms_[i]->getTrq();
301          trq += atrq;
302        }
303 +      if (sl & DataStorage::dslElectricField) {
304 +        ef += atoms_[i]->getElectricField();
305 +      }
306        
307        tau_(0,0) -= rpos[0]*afrc[0];
308        tau_(0,1) -= rpos[0]*afrc[1];
# Line 292 | Line 317 | namespace oopse {
317      }
318      addFrc(frc);
319      addTrq(trq);
320 +
321 +    if (sl & DataStorage::dslElectricField) {
322 +      ef /= atoms_.size();
323 +      setElectricField(ef);
324 +    }
325 +
326      return tau_;
327    }
328  
# Line 371 | Line 402 | namespace oopse {
402  
403  
404      Vector3d velRot;        
405 <    for (int i =0 ; i < refCoords_.size(); ++i) {
405 >    for (unsigned int i = 0 ; i < refCoords_.size(); ++i) {
406        atoms_[i]->setVel(rbVel + mat * refCoords_[i]);
407      }
408  
# Line 400 | Line 431 | namespace oopse {
431  
432  
433      Vector3d velRot;        
434 <    for (int i =0 ; i < refCoords_.size(); ++i) {
434 >    for (unsigned int i = 0 ; i < refCoords_.size(); ++i) {
435        atoms_[i]->setVel(rbVel + mat * refCoords_[i], frame);
436      }
437  

Comparing:
trunk/src/primitives/RigidBody.cpp (property svn:keywords), Revision 1211 by gezelter, Wed Jan 23 16:38:22 2008 UTC vs.
branches/development/src/primitives/RigidBody.cpp (property svn:keywords), Revision 1842 by gezelter, Tue Jan 29 19:10:04 2013 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines