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 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

# Line 1 | Line 1
1 < /*
2 < * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
1 > /*
2 > * Copyright (c) 2005, 2009 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
5   * non-exclusive, royalty free, license to use, modify and
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, 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 < /**
44 <  * @file Stats.hpp
45 <  * @author tlin
46 <  * @date 11/04/2004
47 <  * @time 23:56am
48 <  * @version 1.0
49 <  */
43 > /**
44 > * @file Stats.hpp
45 > * @author tlin
46 > * @date 11/04/2004
47 > * @time 23:56am
48 > * @version 1.0
49 > */
50  
51   #ifndef BRAINS_STATS_HPP
52   #define BRAINS_STATS_HPP
53  
54   #include <string>
55 + #include <map>
56 + #include <bitset>
57  
58   #include "math/SquareMatrix3.hpp"
59 < namespace oopse {
59 > #include "utils/Accumulator.hpp"
60 > #include "brains/SimInfo.hpp"
61  
62 < /**
63 < * @class Stats Stats.hpp "brains/Stats.hpp"
60 < */
61 < class Stats{
62 <    public:
63 <        enum StatsIndex {
64 <            BEGININDEX = 0,  //internal use
65 <            TIME = BEGININDEX,            
66 <            TOTAL_ENERGY,
67 <            POTENTIAL_ENERGY,
68 <            KINETIC_ENERGY,
69 <            TEMPERATURE,
70 <            PRESSURE,
71 <            VOLUME,
72 <            CONSERVED_QUANTITY,            
73 <            TRANSLATIONAL_KINETIC,
74 <            ROTATIONAL_KINETIC,
75 <            LONG_RANGE_POTENTIAL,  
76 <            SHORT_RANGE_POTENTIAL,
77 <            VANDERWAALS_POTENTIAL,
78 <            ELECTROSTATIC_POTENTIAL,
79 <            BOND_POTENTIAL,
80 <            BEND_POTENTIAL,
81 <            DIHEDRAL_POTENTIAL,
82 <            IMPROPER_POTENTIAL,
83 <            VRAW,
84 <            VHARM,
85 <            ENDINDEX  //internal use
86 <        };
62 > using namespace std;
63 > namespace OpenMD {
64  
65 <        Stats();
66 <        const double& operator [](int index) const {
67 <            assert(index >=0 && index < ENDINDEX);
68 <            return data_[index];
69 <        }
65 >  class Stats{
66 >  public:
67 >    enum StatsIndex {
68 >      BEGININDEX = 0,  //internal use
69 >      TIME = BEGININDEX,            
70 >      TOTAL_ENERGY,
71 >      POTENTIAL_ENERGY,
72 >      KINETIC_ENERGY,
73 >      TEMPERATURE,
74 >      PRESSURE,
75 >      VOLUME,
76 >      HULLVOLUME,
77 >      GYRVOLUME,
78 >      CONSERVED_QUANTITY,            
79 >      TRANSLATIONAL_KINETIC,
80 >      ROTATIONAL_KINETIC,
81 >      LONG_RANGE_POTENTIAL,  
82 >      VANDERWAALS_POTENTIAL,
83 >      ELECTROSTATIC_POTENTIAL,
84 >      METALLIC_POTENTIAL,
85 >      HYDROGENBONDING_POTENTIAL,
86 >      SHORT_RANGE_POTENTIAL,
87 >      BOND_POTENTIAL,
88 >      BEND_POTENTIAL,
89 >      DIHEDRAL_POTENTIAL,
90 >      INVERSION_POTENTIAL,
91 >      RAW_POTENTIAL,
92 >      RESTRAINT_POTENTIAL,
93 >      PRESSURE_TENSOR,
94 >      SYSTEM_DIPOLE,
95 >      TAGGED_PAIR_DISTANCE,
96 >      SHADOWH,
97 >      HELFANDMOMENT,
98 >      HEATFLUX,  
99 >      ELECTRONIC_TEMPERATURE,
100 >      COM,
101 >      COM_VELOCITY,
102 >      ANGULAR_MOMENTUM,
103 >      ENDINDEX  //internal use
104 >    };
105  
106 <        double& operator [](int index){
107 <            assert(index >=0 && index < ENDINDEX);            
108 <            return data_[index];
109 <        }
110 <        
111 <        static std::string getTitle(int index) {
112 <            assert(index >=0 && index < ENDINDEX);
113 <            return title_[index];
114 <        }
106 >    struct StatsData {
107 >      string title;
108 >      string units;
109 >      string dataType;
110 >      BaseAccumulator* accumulator;
111 >    };
112 >    
113 >    typedef bitset<ENDINDEX-BEGININDEX> StatsBitSet;
114 >    typedef map<string, StatsIndex> StatsMapType;
115  
116 <        static std::string getUnits(int index) {
117 <            assert(index >=0 && index < ENDINDEX);
118 <            return units_[index];
119 <        }
116 >    Stats(SimInfo* info);
117 >    virtual ~Stats();
118 >    void parseStatFileFormat(const std::string& format);
119 >    void collectStats();
120  
121 <        Mat3x3d getTau() {
122 <            return tau_;
123 <        }
112 <        
113 <        void setTau(const Mat3x3d& tau) {
114 <            tau_ = tau;
115 <        }
116 <        
117 <    private:
118 <        static void init();
119 <        static bool isInit_;
120 <        double data_[ENDINDEX - BEGININDEX];
121 <        static std::string title_[ENDINDEX - BEGININDEX];
122 <        static std::string units_[ENDINDEX - BEGININDEX];
123 <        Mat3x3d tau_;
124 < };
121 >    StatsBitSet  getStatsMask();
122 >    StatsMapType getStatsMap();
123 >    void         setStatsMask(StatsBitSet mask);
124  
125 < } //end namespace oopse
125 >    string    getTitle(int index);
126 >    string    getUnits(int index);
127 >    string    getDataType(int index);
128 >
129 >    int       getIntData(int index);
130 >    RealType  getRealData(int index);
131 >    Vector3d  getVectorData(int index);
132 >    Mat3x3d   getMatrixData(int index);
133 >    
134 >  private:
135 >    SimInfo* info_;
136 >    void init();
137 >    bool isInit_;
138 >    vector<StatsData> data_;
139 >    StatsBitSet statsMask_;
140 >    StatsMapType statsMap_;
141 >  };
142 > } //end namespace OpenMD
143   #endif //BRAINS_STATS_HPP

Comparing trunk/src/brains/Stats.hpp (property svn:keywords):
Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines