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

Comparing trunk/src/integrators/VelocityVerletIntegrator.hpp (file contents):
Revision 276 by tim, Wed Jan 26 15:26:47 2005 UTC vs.
Revision 1413 by gezelter, Mon Mar 22 19:21:22 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 < /**
43 <  * @file VelocityVerletIntegrator.hpp
44 <  * @author tlin
45 <  * @date 11/08/2004
46 <  * @time 13:25am
47 <  * @version 1.0
48 <  */
42 > /**
43 > * @file VelocityVerletIntegrator.hpp
44 > * @author tlin
45 > * @date 11/08/2004
46 > * @time 13:25am
47 > * @version 1.0
48 > */
49  
50   #ifndef INTEGRATORS_VELOCITYVERLETINTEGRATOR_HPP
51   #define INTEGRATORS_VELOCITYVERLETINTEGRATOR_HPP
# Line 53 | Line 53
53   #include "integrators/Integrator.hpp"
54   #include "integrators/RotationAlgorithm.hpp"
55   #include "constraints/Rattle.hpp"
56 < namespace oopse {
56 > #include "utils/ProgressBar.hpp"
57 > namespace OpenMD {
58  
59 < /**
60 < * @class VelocityVerletIntegrator VelocityVerletIntegrator.hpp "integrators/VelocityVerletIntegrator.hpp"
61 < * @brief  Velocity-Verlet Family Integrator
62 < * Template pattern is used in VelocityVerletIntegrator class.
63 < */
64 < class VelocityVerletIntegrator : public Integrator {
65 <    public:
66 <        virtual ~VelocityVerletIntegrator();
59 >  /**
60 >   * @class VelocityVerletIntegrator VelocityVerletIntegrator.hpp "integrators/VelocityVerletIntegrator.hpp"
61 >   * @brief  Velocity-Verlet Family Integrator
62 >   * Template pattern is used in VelocityVerletIntegrator class.
63 >   */
64 >  class VelocityVerletIntegrator : public Integrator {
65 >  public:
66 >    virtual ~VelocityVerletIntegrator();
67  
68 <        void setRotationAlgorithm(RotationAlgorithm* algo) {
69 <            if (algo != rotAlgo && rotAlgo != NULL){            
70 <                delete rotAlgo;
71 <            }
68 >    void setRotationAlgorithm(RotationAlgorithm* algo) {
69 >      if (algo != rotAlgo && rotAlgo != NULL){            
70 >        delete rotAlgo;
71 >      }
72              
73 <            rotAlgo = algo;
74 <        }
73 >      rotAlgo = algo;
74 >    }
75          
76 <    protected:
76 >  protected:
77  
78 <        VelocityVerletIntegrator(SimInfo* info);
78 >    VelocityVerletIntegrator(SimInfo* info);
79  
80 <        virtual void doIntegrate();
80 >    virtual void doIntegrate();
81  
82 <        virtual void initialize();
82 >    virtual void initialize();
83  
84 <        virtual void preStep();
84 >    virtual void preStep();
85          
86 <        virtual void integrateStep();        
86 >    virtual void integrateStep();        
87  
88 <        virtual void postStep();
88 >    virtual void postStep();
89  
90 <        virtual void finalize();
90 >    virtual void finalize();
91  
92 <        RotationAlgorithm* rotAlgo;
93 <        Rattle* rattle;
94 <        double dt2;
92 >    virtual void resetIntegrator() {}
93 >    
94 >    RotationAlgorithm* rotAlgo;
95 >    Rattle* rattle;
96 >    RealType dt2;
97  
98 <        double currSample;
99 <        double currStatus;
100 <        double currThermal;
98 >    RealType currSample;
99 >    RealType currStatus;
100 >    RealType currThermal;
101 >    RealType currReset;
102 >    RealType currRNEMD;
103          
104 <    private:
104 >  private:
105          
106 <        virtual void calcForce(bool needPotential, bool needStress);    
106 >    virtual void calcForce(bool needPotential, bool needStress);    
107          
108 <        virtual void moveA() = 0;
108 >    virtual void moveA() = 0;
109          
110 <        virtual void moveB() = 0;        
110 >    virtual void moveB() = 0;        
111  
112 <        virtual double calcConservedQuantity() = 0;
112 >    virtual RealType calcConservedQuantity() = 0;
113  
114 <        virtual DumpWriter* createDumpWriter();
110 <        virtual DumpWriter* createEorWriter();
111 <        virtual StatWriter* createStatWriter();
114 >    virtual DumpWriter* createDumpWriter();
115  
116 < };
116 >    virtual StatWriter* createStatWriter();
117  
118 < } //end namespace oopse
118 >    ProgressBar* progressBar;
119 >
120 >  };
121 >
122 > } //end namespace OpenMD
123   #endif //INTEGRATORS_VELOCITYVERLETINTEGRATOR_HPP

Diff Legend

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