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

Comparing:
trunk/src/integrators/VelocityVerletIntegrator.hpp (file contents), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/integrators/VelocityVerletIntegrator.hpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 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 53 | Line 54
54   #include "integrators/Integrator.hpp"
55   #include "integrators/RotationAlgorithm.hpp"
56   #include "constraints/Rattle.hpp"
57 < namespace oopse {
57 > #include "utils/ProgressBar.hpp"
58 > namespace OpenMD {
59  
60    /**
61     * @class VelocityVerletIntegrator VelocityVerletIntegrator.hpp "integrators/VelocityVerletIntegrator.hpp"
# Line 88 | Line 90 | namespace oopse {
90  
91      virtual void finalize();
92  
93 +    virtual void resetIntegrator() {}
94 +    
95      RotationAlgorithm* rotAlgo;
96      Rattle* rattle;
97 <    double dt2;
97 >    RealType dt2;
98  
99 <    double currSample;
100 <    double currStatus;
101 <    double currThermal;
99 >    RealType currSample;
100 >    RealType currStatus;
101 >    RealType currThermal;
102 >    RealType currReset;
103 >    RealType currRNEMD;
104          
105    private:
106          
107 <    virtual void calcForce(bool needPotential, bool needStress);    
107 >    virtual void calcForce();    
108          
109      virtual void moveA() = 0;
110          
111      virtual void moveB() = 0;        
112  
113 <    virtual double calcConservedQuantity() = 0;
113 >    virtual RealType calcConservedQuantity() = 0;
114  
115      virtual DumpWriter* createDumpWriter();
116  
117      virtual StatWriter* createStatWriter();
112        
113    virtual RestWriter* createRestWriter();
118  
119 +    ProgressBar* progressBar;
120 +
121    };
122  
123 < } //end namespace oopse
123 > } //end namespace OpenMD
124   #endif //INTEGRATORS_VELOCITYVERLETINTEGRATOR_HPP

Comparing:
trunk/src/integrators/VelocityVerletIntegrator.hpp (property svn:keywords), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/integrators/VelocityVerletIntegrator.hpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines