ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/integrators/LangevinDynamics.cpp
(Generate patch)

Comparing trunk/src/integrators/LangevinDynamics.cpp (file contents):
Revision 1237 by gezelter, Fri Apr 18 16:55:15 2008 UTC vs.
Revision 1782 by gezelter, Wed Aug 22 02:28:28 2012 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  
43   /**
# Line 49 | Line 50
50  
51   #include "integrators/LangevinDynamics.hpp"
52   #include "primitives/Molecule.hpp"
53 < #include "utils/OOPSEConstant.hpp"
53 > #include "utils/PhysicalConstants.hpp"
54   #include "integrators/LDForceManager.hpp"
55 < namespace oopse {
55 > namespace OpenMD {
56  
57    
58    LangevinDynamics::LangevinDynamics(SimInfo* info) : VelocityVerletIntegrator(info){
# Line 66 | Line 67 | namespace oopse {
67      SimInfo::MoleculeIterator i;
68      Molecule::IntegrableObjectIterator  j;
69      Molecule* mol;
70 <    StuntDouble* integrableObject;
70 >    StuntDouble* sd;
71      Vector3d vel;
72      Vector3d pos;
73      Vector3d frc;
# Line 74 | Line 75 | namespace oopse {
75      Vector3d ji;
76      RealType mass;
77      
78 <    for (mol = info_->beginMolecule(i); mol != NULL; mol = info_->nextMolecule(i)) {
79 <      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
79 <           integrableObject = mol->nextIntegrableObject(j)) {
78 >    for (mol = info_->beginMolecule(i); mol != NULL;
79 >         mol = info_->nextMolecule(i)) {
80  
81 <        vel =integrableObject->getVel();
82 <        pos = integrableObject->getPos();
83 <        frc = integrableObject->getFrc();
84 <        mass = integrableObject->getMass();
81 >      for (sd = mol->beginIntegrableObject(j); sd != NULL;
82 >           sd = mol->nextIntegrableObject(j)) {
83 >
84 >        vel = sd->getVel();
85 >        pos = sd->getPos();
86 >        frc = sd->getFrc();
87 >        mass = sd->getMass();
88                  
89          // velocity half step
90 <        vel += (dt2 /mass * OOPSEConstant::energyConvert) * frc;
90 >        vel += (dt2 /mass * PhysicalConstants::energyConvert) * frc;
91  
92          // position whole step
93          pos += dt * vel;
94  
95 <        integrableObject->setVel(vel);
96 <        integrableObject->setPos(pos);
95 >        sd->setVel(vel);
96 >        sd->setPos(pos);
97  
98 <        if (integrableObject->isDirectional()){
98 >        if (sd->isDirectional()){
99  
100            // get and convert the torque to body frame
101  
102 <          Tb = integrableObject->lab2Body(integrableObject->getTrq());
102 >          Tb = sd->lab2Body(sd->getTrq());
103  
104            // get the angular momentum, and propagate a half step
105  
106 <          ji = integrableObject->getJ();
106 >          ji = sd->getJ();
107  
108 <          ji += (dt2  * OOPSEConstant::energyConvert) * Tb;
108 >          ji += (dt2  * PhysicalConstants::energyConvert) * Tb;
109  
110 <          rotAlgo->rotate(integrableObject, ji, dt);
110 >          rotAlgo_->rotate(sd, ji, dt);
111  
112 <          integrableObject->setJ(ji);
112 >          sd->setJ(ji);
113          }
114  
115              
116        }
117      } //end for(mol = info_->beginMolecule(i))
118      
119 <    rattle->constraintA();
120 <    
119 >    flucQ_->moveA();
120 >    rattle_->constraintA();    
121    }    
122  
123    void LangevinDynamics::moveB(){
124      SimInfo::MoleculeIterator i;
125      Molecule::IntegrableObjectIterator  j;
126      Molecule* mol;
127 <    StuntDouble* integrableObject;
127 >    StuntDouble* sd;
128      Vector3d vel;
129      Vector3d frc;
130      Vector3d Tb;
131      Vector3d ji;
132      RealType mass;
133      
134 <    for (mol = info_->beginMolecule(i); mol != NULL; mol = info_->nextMolecule(i)) {
135 <      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
133 <           integrableObject = mol->nextIntegrableObject(j)) {
134 >    for (mol = info_->beginMolecule(i); mol != NULL;
135 >         mol = info_->nextMolecule(i)) {
136  
137 <        vel =integrableObject->getVel();
138 <        frc = integrableObject->getFrc();
139 <        mass = integrableObject->getMass();
137 >      for (sd = mol->beginIntegrableObject(j); sd != NULL;
138 >           sd = mol->nextIntegrableObject(j)) {
139 >
140 >        vel = sd->getVel();
141 >        frc = sd->getFrc();
142 >        mass = sd->getMass();
143                  
144          // velocity half step
145 <        vel += (dt2 /mass * OOPSEConstant::energyConvert) * frc;
145 >        vel += (dt2 /mass * PhysicalConstants::energyConvert) * frc;
146                  
147 <        integrableObject->setVel(vel);
147 >        sd->setVel(vel);
148  
149 <        if (integrableObject->isDirectional()){
149 >        if (sd->isDirectional()){
150  
151            // get and convert the torque to body frame
152  
153 <          Tb = integrableObject->lab2Body(integrableObject->getTrq());
153 >          Tb = sd->lab2Body(sd->getTrq());
154  
155            // get the angular momentum, and propagate a half step
156  
157 <          ji = integrableObject->getJ();
157 >          ji = sd->getJ();
158  
159 <          ji += (dt2  * OOPSEConstant::energyConvert) * Tb;
159 >          ji += (dt2  * PhysicalConstants::energyConvert) * Tb;
160  
161 <          integrableObject->setJ(ji);
161 >          sd->setJ(ji);
162          }
163  
164              
165        }
166      } //end for(mol = info_->beginMolecule(i))
167    
168 <
169 <    rattle->constraintB();
165 <
168 >    flucQ_->moveB();
169 >    rattle_->constraintB();
170    }
171  
172  
# Line 170 | Line 174 | namespace oopse {
174      return 0.0;
175    }
176  
177 < } //end namespace oopse
177 > } //end namespace OpenMD
178  

Comparing trunk/src/integrators/LangevinDynamics.cpp (property svn:keywords):
Revision 1237 by gezelter, Fri Apr 18 16:55:15 2008 UTC vs.
Revision 1782 by gezelter, Wed Aug 22 02:28:28 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines