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

Comparing trunk/src/integrators/RNEMD.hpp (file contents):
Revision 1560 by skuang, Wed May 11 17:55:32 2011 UTC vs.
Revision 1561 by gezelter, Wed May 11 19:04:40 2011 UTC

# Line 55 | Line 55
55   #include "selection/SelectionManager.hpp"
56   #include <iostream>
57  
58 + using namespace std;
59   namespace OpenMD {
60  
61    /**
# Line 97 | Line 98 | namespace OpenMD {
98      
99      SimInfo* info_;
100      RandNumGen* randNumGen_;
101 <    std::map<std::string, RNEMDTypeEnum> stringToEnumMap_;
101 >    map<string, RNEMDTypeEnum> stringToEnumMap_;
102      RNEMDTypeEnum rnemdType_;
103 <    std::string rnemdObjectSelection_;
103 >    string rnemdObjectSelection_;
104      SelectionEvaluator evaluator_;
105      SelectionManager seleMan_;
106      bool usePeriodicBoundaryConditions_;
# Line 113 | Line 114 | namespace OpenMD {
114      RealType exchangeSum_;
115      int failTrialCount_;
116      int failRootCount_;
117 <    std::ofstream rnemdLog_;
117 >    ofstream rnemdLog_;
118      // keeps track of what's being averaged
119 <    std::vector<RealType> valueHist_;
120 <    std::vector<int> valueCount_, xyzTempCount_;
119 >    vector<RealType> valueHist_;
120 >    vector<int> valueCount_, xyzTempCount_;
121      // keeps track of the number of degrees of freedom being averaged
122 <    std::vector<RealType> xTempHist_, yTempHist_, zTempHist_;
123 <    std::ofstream xTempLog_, yTempLog_, zTempLog_;
122 >    vector<RealType> xTempHist_, yTempHist_, zTempHist_;
123 >    ofstream xTempLog_, yTempLog_, zTempLog_;
124    };
125  
126   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines