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

Comparing:
trunk/src/integrators/NVT.cpp (file contents), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/integrators/NVT.cpp (file contents), Revision 1710 by gezelter, Fri May 18 21:44:02 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   #include "integrators/NVT.hpp"
44   #include "primitives/Molecule.hpp"
45   #include "utils/simError.h"
46 < #include "utils/OOPSEConstant.hpp"
46 > #include "utils/PhysicalConstants.hpp"
47  
48 < namespace oopse {
48 > namespace OpenMD {
49  
50    NVT::NVT(SimInfo* info) : VelocityVerletIntegrator(info), chiTolerance_ (1e-6), maxIterNum_(4) {
51  
# Line 59 | Line 60 | namespace oopse {
60      if (!simParams->haveTargetTemp()) {
61        sprintf(painCave.errMsg, "You can't use the NVT integrator without a targetTemp_!\n");
62        painCave.isFatal = 1;
63 <      painCave.severity = OOPSE_ERROR;
63 >      painCave.severity = OPENMD_ERROR;
64        simError();
65      } else {
66        targetTemp_ = simParams->getTargetTemp();
67      }
68  
69 <    // We must set tauThermostat_.
69 >    // We must set tauThermostat.
70  
71      if (!simParams->haveTauThermostat()) {
72        sprintf(painCave.errMsg, "If you use the constant temperature\n"
73 <              "\tintegrator, you must set tauThermostat_.\n");
73 >              "\tintegrator, you must set tauThermostat.\n");
74  
75 <      painCave.severity = OOPSE_ERROR;
75 >      painCave.severity = OPENMD_ERROR;
76        painCave.isFatal = 1;
77        simError();
78      } else {
# Line 115 | Line 116 | namespace oopse {
116          mass = integrableObject->getMass();
117  
118          // velocity half step  (use chi from previous step here):
119 <        //vel[j] += dt2 * ((frc[j] / mass ) * OOPSEConstant::energyConvert - vel[j]*chi);
120 <        vel += dt2 *OOPSEConstant::energyConvert/mass*frc - dt2*chi*vel;
119 >        //vel[j] += dt2 * ((frc[j] / mass ) * PhysicalConstants::energyConvert - vel[j]*chi);
120 >        vel += dt2 *PhysicalConstants::energyConvert/mass*frc - dt2*chi*vel;
121          
122          // position whole step
123          //pos[j] += dt * vel[j];
# Line 134 | Line 135 | namespace oopse {
135  
136            ji = integrableObject->getJ();
137  
138 <          //ji[j] += dt2 * (Tb[j] * OOPSEConstant::energyConvert - ji[j]*chi);
139 <          ji += dt2*OOPSEConstant::energyConvert*Tb - dt2*chi *ji;
138 >          //ji[j] += dt2 * (Tb[j] * PhysicalConstants::energyConvert - ji[j]*chi);
139 >          ji += dt2*PhysicalConstants::energyConvert*Tb - dt2*chi *ji;
140            rotAlgo->rotate(integrableObject, ji, dt);
141  
142            integrableObject->setJ(ji);
# Line 181 | Line 182 | namespace oopse {
182      for (mol = info_->beginMolecule(i); mol != NULL; mol = info_->nextMolecule(i)) {
183        for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
184             integrableObject = mol->nextIntegrableObject(j)) {
184        oldVel_[index] = integrableObject->getVel();
185        oldJi_[index] = integrableObject->getJ();                
185  
186 +        oldVel_[index] = integrableObject->getVel();
187 +        
188 +        if (integrableObject->isDirectional())
189 +          oldJi_[index] = integrableObject->getJ();                
190 +        
191          ++index;    
192 <      }
189 <          
192 >      }          
193      }
194  
195      // do the iteration:
# Line 211 | Line 214 | namespace oopse {
214  
215            // velocity half step
216            //for(j = 0; j < 3; j++)
217 <          //    vel[j] = oldVel_[3*i+j] + dt2 * ((frc[j] / mass ) * OOPSEConstant::energyConvert - oldVel_[3*i + j]*chi);
218 <          vel = oldVel_[index] + dt2/mass*OOPSEConstant::energyConvert * frc - dt2*chi*oldVel_[index];
217 >          //    vel[j] = oldVel_[3*i+j] + dt2 * ((frc[j] / mass ) * PhysicalConstants::energyConvert - oldVel_[3*i + j]*chi);
218 >          vel = oldVel_[index] + dt2/mass*PhysicalConstants::energyConvert * frc - dt2*chi*oldVel_[index];
219              
220            integrableObject->setVel(vel);
221  
# Line 223 | Line 226 | namespace oopse {
226              Tb =  integrableObject->lab2Body(integrableObject->getTrq());
227  
228              //for(j = 0; j < 3; j++)
229 <            //    ji[j] = oldJi_[3*i + j] + dt2 * (Tb[j] * OOPSEConstant::energyConvert - oldJi_[3*i+j]*chi);
230 <            ji = oldJi_[index] + dt2*OOPSEConstant::energyConvert*Tb - dt2*chi *oldJi_[index];
229 >            //    ji[j] = oldJi_[3*i + j] + dt2 * (Tb[j] * PhysicalConstants::energyConvert - oldJi_[3*i+j]*chi);
230 >            ji = oldJi_[index] + dt2*PhysicalConstants::energyConvert*Tb - dt2*chi *oldJi_[index];
231  
232              integrableObject->setJ(ji);
233            }
# Line 263 | Line 266 | namespace oopse {
266      RealType thermostat_kinetic;
267      RealType thermostat_potential;
268      
269 <    fkBT = info_->getNdf() *OOPSEConstant::kB *targetTemp_;
269 >    fkBT = info_->getNdf() *PhysicalConstants::kB *targetTemp_;
270  
271      Energy = thermo.getTotalE();
272  
273 <    thermostat_kinetic = fkBT * tauThermostat_ * tauThermostat_ * chi * chi / (2.0 * OOPSEConstant::energyConvert);
273 >    thermostat_kinetic = fkBT * tauThermostat_ * tauThermostat_ * chi * chi / (2.0 * PhysicalConstants::energyConvert);
274  
275 <    thermostat_potential = fkBT * integralOfChidt / OOPSEConstant::energyConvert;
275 >    thermostat_potential = fkBT * integralOfChidt / PhysicalConstants::energyConvert;
276  
277      conservedQuantity = Energy + thermostat_kinetic + thermostat_potential;
278  
# Line 277 | Line 280 | namespace oopse {
280    }
281  
282  
283 < }//end namespace oopse
283 > }//end namespace OpenMD

Comparing:
trunk/src/integrators/NVT.cpp (property svn:keywords), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/integrators/NVT.cpp (property svn:keywords), Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines