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 998 by chrisfen, Mon Jul 3 13:18:43 2006 UTC vs.
branches/development/src/brains/Thermo.hpp (file contents), Revision 1723 by gezelter, Thu May 24 20:59:54 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   #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 60 | Line 61 | namespace oopse {
61      RealType getTotalE(); // gets the total energy
62  
63      RealType getTemperature(); // gives the instant temp. in K
64 +    RealType getElectronicTemperature(); // gives the instant electronic temperature in K
65  
66      RealType getPressure(); // gives the instant pressure in atm;
67      RealType getPressureX() { return getPressure(0); }
# Line 72 | Line 74 | namespace oopse {
74  
75      // accumulate and return the simulation box dipole moment in C*m
76      Vector3d getBoxDipole();
77 <
77 >    Vector3d getHeatFlux();
78      void saveStat();
79      
80    private:
# Line 81 | Line 83 | namespace oopse {
83      SimInfo* info_;
84    };
85    
86 < } //end namespace oopse
86 > } //end namespace OpenMD
87   #endif

Comparing:
trunk/src/brains/Thermo.hpp (property svn:keywords), Revision 998 by chrisfen, Mon Jul 3 13:18:43 2006 UTC vs.
branches/development/src/brains/Thermo.hpp (property svn:keywords), Revision 1723 by gezelter, Thu May 24 20:59:54 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines