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

Comparing trunk/src/primitives/DirectionalAtom.cpp (file contents):
Revision 273 by tim, Tue Jan 25 17:45:23 2005 UTC vs.
Revision 1424 by gezelter, Tue Mar 30 15:05:38 2010 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   #include "primitives/DirectionalAtom.hpp"
43   #include "utils/simError.h"
44 < namespace oopse {
45 <
46 < DirectionalAtom::DirectionalAtom(DirectionalAtomType* dAtomType)
47 <                         : Atom(dAtomType){
44 > namespace OpenMD {
45 >  
46 >  DirectionalAtom::DirectionalAtom(DirectionalAtomType* dAtomType)
47 >    : Atom(dAtomType){
48      objType_= otDAtom;
49      if (dAtomType->isMultipole()) {
50 <        electroBodyFrame_ = dAtomType->getElectroBodyFrame();
50 >      electroBodyFrame_ = dAtomType->getElectroBodyFrame();
51      }
52 <
53 <    //check if one of the diagonal inertia tensor of this directional atom  is zero
52 >    
53 >    // Check if one of the diagonal inertia tensor of this directional
54 >    // atom is zero:
55      int nLinearAxis = 0;
56      Mat3x3d inertiaTensor = getI();
57      for (int i = 0; i < 3; i++) {    
58 <        if (fabs(inertiaTensor(i, i)) < oopse::epsilon) {
59 <            linear_ = true;
60 <            linearAxis_ = i;
61 <            ++ nLinearAxis;
62 <        }
58 >      if (fabs(inertiaTensor(i, i)) < OpenMD::epsilon) {
59 >        linear_ = true;
60 >        linearAxis_ = i;
61 >        ++ nLinearAxis;
62 >      }
63      }
64  
65      if (nLinearAxis > 1) {
66 <        sprintf( painCave.errMsg,
67 <            "Directional Atom error.\n"
68 <            "\tOOPSE found more than one axis in this directional atom with a vanishing \n"
69 <            "\tmoment of inertia.");
70 <        painCave.isFatal = 1;
71 <        simError();
72 <    }
73 <      
74 < }
75 <
75 < Mat3x3d DirectionalAtom::getI() {
66 >      sprintf( painCave.errMsg,
67 >               "Directional Atom warning.\n"
68 >               "\tOpenMD found more than one axis in this directional atom with a vanishing \n"
69 >               "\tmoment of inertia.");
70 >      painCave.isFatal = 0;
71 >      simError();
72 >    }    
73 >  }
74 >  
75 >  Mat3x3d DirectionalAtom::getI() {
76      return static_cast<DirectionalAtomType*>(getAtomType())->getI();
77 < }    
78 <
79 < void DirectionalAtom::setPrevA(const RotMat3x3d& a) {
77 >  }    
78 >  
79 >  void DirectionalAtom::setPrevA(const RotMat3x3d& a) {
80      ((snapshotMan_->getPrevSnapshot())->*storage_).aMat[localIndex_] = a;
81      if (atomType_->isMultipole()) {
82 <        ((snapshotMan_->getPrevSnapshot())->*storage_).electroFrame[localIndex_] = a.transpose() * electroBodyFrame_;
82 >      ((snapshotMan_->getPrevSnapshot())->*storage_).electroFrame[localIndex_] = a.transpose() * electroBodyFrame_;
83      }
84 < }
85 <
86 <      
87 < void DirectionalAtom::setA(const RotMat3x3d& a) {
84 >  }
85 >  
86 >  
87 >  void DirectionalAtom::setA(const RotMat3x3d& a) {
88      ((snapshotMan_->getCurrentSnapshot())->*storage_).aMat[localIndex_] = a;
89 <
89 >    
90      if (atomType_->isMultipole()) {
91 <        ((snapshotMan_->getCurrentSnapshot())->*storage_).electroFrame[localIndex_] = a.transpose() * electroBodyFrame_;
91 >      ((snapshotMan_->getCurrentSnapshot())->*storage_).electroFrame[localIndex_] = a.transpose() * electroBodyFrame_;
92      }
93 < }    
94 <    
95 < void DirectionalAtom::setA(const RotMat3x3d& a, int snapshotNo) {
93 >  }    
94 >  
95 >  void DirectionalAtom::setA(const RotMat3x3d& a, int snapshotNo) {
96      ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).aMat[localIndex_] = a;
97 <
97 >    
98      if (atomType_->isMultipole()) {
99 <        ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).electroFrame[localIndex_] = a.transpose() * electroBodyFrame_;    
99 >      ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).electroFrame[localIndex_] = a.transpose() * electroBodyFrame_;    
100      }
101 < }    
102 <
103 < void DirectionalAtom::rotateBy(const RotMat3x3d& m) {
101 >  }    
102 >  
103 >  void DirectionalAtom::rotateBy(const RotMat3x3d& m) {
104      setA(m *getA());
105 < }
106 <
107 < std::vector<double> DirectionalAtom::getGrad() {
108 <    std::vector<double> grad(6, 0.0);
105 >  }
106 >  
107 >  std::vector<RealType> DirectionalAtom::getGrad() {
108 >    std::vector<RealType> grad(6, 0.0);
109      Vector3d force;
110      Vector3d torque;
111      Vector3d myEuler;
112 <    double phi, theta, psi;
113 <    double cphi, sphi, ctheta, stheta;
112 >    RealType phi, theta, psi;
113 >    RealType cphi, sphi, ctheta, stheta;
114      Vector3d ephi;
115      Vector3d etheta;
116      Vector3d epsi;
117 <
117 >    
118      force = getFrc();
119      torque =getTrq();
120      myEuler = getA().toEulerAngles();
121 <
121 >    
122      phi = myEuler[0];
123      theta = myEuler[1];
124      psi = myEuler[2];
125 <
125 >    
126      cphi = cos(phi);
127      sphi = sin(phi);
128      ctheta = cos(theta);
129      stheta = sin(theta);
130 <
130 >    
131      // get unit vectors along the phi, theta and psi rotation axes
132 <
132 >    
133      ephi[0] = 0.0;
134      ephi[1] = 0.0;
135      ephi[2] = 1.0;
136 <
136 >    
137 >    //etheta[0] = -sphi;
138 >    //etheta[1] =  cphi;
139 >    //etheta[2] =  0.0;
140 >    
141      etheta[0] = cphi;
142      etheta[1] = sphi;
143      etheta[2] = 0.0;
144 <
144 >    
145      epsi[0] = stheta * cphi;
146      epsi[1] = stheta * sphi;
147      epsi[2] = ctheta;
148 <
148 >    
149      //gradient is equal to -force
150      for (int j = 0 ; j<3; j++)
151 <        grad[j] = -force[j];
152 <
153 <    for (int j = 0; j < 3; j++ ) {
154 <
155 <        grad[3] += torque[j]*ephi[j];
156 <        grad[4] += torque[j]*etheta[j];
153 <        grad[5] += torque[j]*epsi[j];
154 <
151 >      grad[j] = -force[j];
152 >    
153 >    for (int j = 0; j < 3; j++ ) {      
154 >      grad[3] -= torque[j]*ephi[j];
155 >      grad[4] -= torque[j]*etheta[j];
156 >      grad[5] -= torque[j]*epsi[j];      
157      }
158      
159      return grad;
160 < }    
161 <
162 < void DirectionalAtom::accept(BaseVisitor* v) {
160 >  }    
161 >  
162 >  void DirectionalAtom::accept(BaseVisitor* v) {
163      v->visit(this);
164 < }    
163 <
164 >  }
165   }
166  

Diff Legend

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