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

Comparing:
trunk/src/brains/Thermo.hpp (file contents), Revision 538 by tim, Thu May 19 21:31:23 2005 UTC vs.
branches/development/src/brains/Thermo.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   #ifndef BRAINS_THERMO_HPP
# Line 45 | Line 46
46   #include "primitives/Atom.hpp"
47   #include "brains/SimInfo.hpp"
48  
49 < namespace oopse {
49 > namespace OpenMD {
50  
51    class Thermo{
52  
# Line 55 | Line 56 | namespace oopse {
56  
57      // note: all the following energies are in kcal/mol
58  
59 <    double getKinetic(); // the total kinetic energy
60 <    double getPotential(); // the total potential energy
61 <    double getTotalE(); // gets the total energy
59 >    RealType getKinetic(); // the total kinetic energy
60 >    RealType getPotential(); // the total potential energy
61 >    RealType getTotalE(); // gets the total energy
62  
63 <    double getTemperature(); // gives the instant temp. in K
63 >    RealType getTemperature(); // gives the instant temp. in K
64  
65 <    double getPressure(); // gives the instant pressure in atm;
66 <          double getPressureX() { return getPressure(0); }
67 <          double getPressureY() { return getPressure(1); }
68 <          double getPressureZ() { return getPressure(2); }
65 >    RealType getPressure(); // gives the instant pressure in atm;
66 >    RealType getPressureX() { return getPressure(0); }
67 >    RealType getPressureY() { return getPressure(1); }
68 >    RealType getPressureZ() { return getPressure(2); }
69  
70 <    Mat3x3d getPressureTensor(); // gives the pressure  tensor in amu*fs^-2*Ang^-1
71 <    double getVolume();   // gives the volume in Ang^3
70 >    // gives the pressure tensor in amu*fs^-2*Ang^-1
71 >    Mat3x3d getPressureTensor();
72 >    RealType getVolume();   // gives the volume in Ang^3
73  
74 +    // accumulate and return the simulation box dipole moment in C*m
75 +    Vector3d getBoxDipole();
76 +
77      void saveStat();
78 <        
78 >    
79    private:
80 <    double getPressure(int direction);
81 <
80 >    RealType getPressure(int direction);
81 >    
82      SimInfo* info_;
83    };
84 <
85 < } //end namespace oopse
84 >  
85 > } //end namespace OpenMD
86   #endif

Comparing:
trunk/src/brains/Thermo.hpp (property svn:keywords), Revision 538 by tim, Thu May 19 21:31:23 2005 UTC vs.
branches/development/src/brains/Thermo.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