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 390 by tim, Tue Mar 1 23:17:46 2005 UTC vs.
Revision 998 by chrisfen, Mon Jul 3 13:18:43 2006 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 47 | Line 47 | namespace oopse {
47  
48   namespace oopse {
49  
50 < class Thermo{
50 >  class Thermo{
51  
52 <    public:
52 >  public:
53  
54 <        Thermo( SimInfo* info) : info_(info) {}
54 >    Thermo( SimInfo* info) : info_(info) {}
55  
56 <        // note: all the following energies are in kcal/mol
56 >    // note: all the following energies are in kcal/mol
57  
58 <        double getKinetic(); // the total kinetic energy
59 <        double getPotential(); // the total potential energy
60 <        double getTotalE(); // gets the total energy
58 >    RealType getKinetic(); // the total kinetic energy
59 >    RealType getPotential(); // the total potential energy
60 >    RealType getTotalE(); // gets the total energy
61  
62 <        double getTemperature(); // gives the instant temp. in K
62 >    RealType getTemperature(); // gives the instant temp. in K
63  
64 <        double getPressure(); // gives the instant pressure in atm;
64 >    RealType getPressure(); // gives the instant pressure in atm;
65 >    RealType getPressureX() { return getPressure(0); }
66 >    RealType getPressureY() { return getPressure(1); }
67 >    RealType getPressureZ() { return getPressure(2); }
68  
69 <        Mat3x3d getPressureTensor(); // gives the pressure  tensor in amu*fs^-2*Ang^-1
70 <        double getVolume();   // gives the volume in Ang^3
69 >    // gives the pressure tensor in amu*fs^-2*Ang^-1
70 >    Mat3x3d getPressureTensor();
71 >    RealType getVolume();   // gives the volume in Ang^3
72  
73 <        void saveStat();
74 <        
71 <    private:
72 <        SimInfo* info_;
73 < };
73 >    // accumulate and return the simulation box dipole moment in C*m
74 >    Vector3d getBoxDipole();
75  
76 +    void saveStat();
77 +    
78 +  private:
79 +    RealType getPressure(int direction);
80 +    
81 +    SimInfo* info_;
82 +  };
83 +  
84   } //end namespace oopse
85   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines