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

Comparing branches/development/src/rnemd/RNEMD.hpp (file contents):
Revision 1773 by gezelter, Tue Aug 7 18:26:40 2012 UTC vs.
Revision 1813 by gezelter, Fri Nov 16 21:39:55 2012 UTC

# Line 76 | Line 76 | namespace OpenMD {
76      void writeOutputFile();
77      void writeReal(int index, unsigned int bin);
78      void writeVector(int index, unsigned int bin);
79 +    void writeRealStdDev(int index, unsigned int bin);
80 +    void writeVectorStdDev(int index, unsigned int bin);
81  
82    private:
83  
# Line 112 | Line 114 | namespace OpenMD {
114        string title;
115        string units;
116        string dataType;
117 <      vector<Accumulator*> accumulator;
117 >      vector<BaseAccumulator*> accumulator;
118      };
119  
120      typedef bitset<ENDINDEX-BEGININDEX> OutputBitSet;
# Line 158 | Line 160 | namespace OpenMD {
160      vector<OutputData> data_;
161      OutputBitSet outputMask_;
162      OutputMapType outputMap_;
163 +    Accumulator* areaAccumulator_;
164 +    bool doRNEMD_;
165  
166    };
167   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines