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

Comparing trunk/src/brains/Stats.hpp (file contents):
Revision 1402 by chuckv, Fri Jan 8 17:15:27 2010 UTC vs.
Revision 1925 by gezelter, Wed Aug 7 15:24:16 2013 UTC

# Line 35 | Line 35
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).                        
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (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 52 | Line 53
53  
54   #include <string>
55   #include <map>
56 + #include <bitset>
57  
58   #include "math/SquareMatrix3.hpp"
59 + #include "utils/Accumulator.hpp"
60 + #include "brains/SimInfo.hpp"
61 +
62 + using namespace std;
63   namespace OpenMD {
64  
59  /**
60   * @class Stats Stats.hpp "brains/Stats.hpp"
61   */
65    class Stats{
66    public:
67      enum StatsIndex {
# Line 76 | Line 79 | namespace OpenMD {
79        TRANSLATIONAL_KINETIC,
80        ROTATIONAL_KINETIC,
81        LONG_RANGE_POTENTIAL,  
79      SHORT_RANGE_POTENTIAL,
82        VANDERWAALS_POTENTIAL,
83 <      ELECTROSTATIC_POTENTIAL,
83 >      ELECTROSTATIC_POTENTIAL,      
84 >      METALLIC_POTENTIAL,
85 >      HYDROGENBONDING_POTENTIAL,
86 >      RECIPROCAL_POTENTIAL,
87 >      SHORT_RANGE_POTENTIAL,
88        BOND_POTENTIAL,
89        BEND_POTENTIAL,
90        DIHEDRAL_POTENTIAL,
91        INVERSION_POTENTIAL,
92 <      VRAW,
93 <      VHARM,
94 <      PRESSURE_TENSOR_XX,
95 <      PRESSURE_TENSOR_XY,
90 <      PRESSURE_TENSOR_XZ,
91 <      PRESSURE_TENSOR_YX,
92 <      PRESSURE_TENSOR_YY,
93 <      PRESSURE_TENSOR_YZ,
94 <      PRESSURE_TENSOR_ZX,
95 <      PRESSURE_TENSOR_ZY,
96 <      PRESSURE_TENSOR_ZZ,
97 <      BOX_DIPOLE_X,
98 <      BOX_DIPOLE_Y,
99 <      BOX_DIPOLE_Z,
92 >      RAW_POTENTIAL,
93 >      RESTRAINT_POTENTIAL,
94 >      PRESSURE_TENSOR,
95 >      SYSTEM_DIPOLE,
96        TAGGED_PAIR_DISTANCE,
101      RNEMD_EXCHANGE_TOTAL,
97        SHADOWH,
98 +      HELFANDMOMENT,
99 +      HEATFLUX,  
100 +      ELECTRONIC_TEMPERATURE,
101 +      COM,
102 +      COM_VELOCITY,
103 +      ANGULAR_MOMENTUM,
104        ENDINDEX  //internal use
105      };
106  
107 <    Stats();
108 <    const RealType& operator [](int index) const {
109 <      assert(index >=0 && index < ENDINDEX);
110 <      return data_[index];
111 <    }
107 >    struct StatsData {
108 >      string title;
109 >      string units;
110 >      string dataType;
111 >      BaseAccumulator* accumulator;
112 >    };
113 >    
114 >    typedef bitset<ENDINDEX-BEGININDEX> StatsBitSet;
115 >    typedef map<string, StatsIndex> StatsMapType;
116  
117 <    RealType& operator [](int index){
118 <      assert(index >=0 && index < ENDINDEX);            
119 <      return data_[index];
120 <    }
116 <        
117 <    static std::string getTitle(int index) {
118 <      assert(index >=0 && index < ENDINDEX);
119 <      return title_[index];
120 <    }
117 >    Stats(SimInfo* info);
118 >    virtual ~Stats();
119 >    void parseStatFileFormat(const std::string& format);
120 >    void collectStats();
121  
122 <    static std::string getUnits(int index) {
123 <      assert(index >=0 && index < ENDINDEX);
124 <      return units_[index];
125 <    }
122 >    StatsBitSet  getStatsMask();
123 >    StatsMapType getStatsMap();
124 >    void         setStatsMask(StatsBitSet mask);
125  
126 <    Mat3x3d getTau() {
127 <      return tau_;
128 <    }
130 <        
131 <    void setTau(const Mat3x3d& tau) {
132 <      tau_ = tau;
133 <    }
126 >    string    getTitle(int index);
127 >    string    getUnits(int index);
128 >    string    getDataType(int index);
129  
130 <    typedef std::map<std::string, Stats::StatsIndex> StatsMapType;
131 <    static  StatsMapType statsMap;
132 <  
130 >    int       getIntData(int index);
131 >    RealType  getRealData(int index);
132 >    Vector3d  getVectorData(int index);
133 >    Mat3x3d   getMatrixData(int index);
134 >    
135    private:
136 <    static void init();
137 <    static bool isInit_;
138 <    RealType data_[ENDINDEX - BEGININDEX];
139 <    static std::string title_[ENDINDEX - BEGININDEX];
140 <    static std::string units_[ENDINDEX - BEGININDEX];
141 <    Mat3x3d tau_;
136 >    SimInfo* info_;
137 >    void init();
138 >    bool isInit_;
139 >    vector<StatsData> data_;
140 >    StatsBitSet statsMask_;
141 >    StatsMapType statsMap_;
142    };
146
147
148
143   } //end namespace OpenMD
144   #endif //BRAINS_STATS_HPP

Comparing trunk/src/brains/Stats.hpp (property svn:keywords):
Revision 1402 by chuckv, Fri Jan 8 17:15:27 2010 UTC vs.
Revision 1925 by gezelter, Wed Aug 7 15:24:16 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines