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/integrators/RNEMD.hpp (file contents):
Revision 1728 by jmarr, Wed May 30 16:07:03 2012 UTC vs.
Revision 1730 by gezelter, Wed May 30 17:19:13 2012 UTC

# Line 147 | Line 147 | namespace OpenMD {
147      int logFrameCount_;
148      // James added denLog, vzzLog
149      ofstream tempLog_, vxzLog_, vyzLog_, denLog_, vzzLog_, denLog2_;
150 <    ofstream xTempLog_, yTempLog_, zTempLog_, rotTempLog_;
150 >    ofstream xTempLog_, yTempLog_, zTempLog_, rotTempLog_, AhLog_;
151      // keeps track of what's being averaged James added DenHist, pzzHist
152      vector<RealType> tempHist_, pxzHist_, pyzHist_, mHist_, DenHist_, pzzHist_, DenHist2_;
153      vector<RealType> xTempHist_, yTempHist_, zTempHist_, rotTempHist_;
154      // keeps track of the number of degrees of freedom being averaged
155      //vector<int> pxzCount_, pyzCount_;
156      vector<int> tempCount_, xyzTempCount_, rotTempCount_;
157 +    RealType Asum_, Jsum_, AhCount_, runTime_, statusTime_;
158 +    int Numcount_;
159 +    bool outputAh_;
160    };
161  
162   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines