ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/staticProps/GofRZ.cpp
(Generate patch)

Comparing trunk/src/applications/staticProps/GofRZ.cpp (file contents):
Revision 1782 by gezelter, Wed Aug 22 02:28:28 2012 UTC vs.
Revision 1790 by gezelter, Thu Aug 30 17:18:22 2012 UTC

# Line 70 | Line 70 | namespace OpenMD {
70      }
71    }
72  
73 <  void GofRZ::initalizeHistogram() {
73 >  void GofRZ::initializeHistogram() {
74      npairs_ = 0;
75      for (unsigned int i = 0; i < histogram_.size(); ++i){
76        std::fill(histogram_[i].begin(), histogram_[i].end(), 0);
# Line 109 | Line 109 | namespace OpenMD {
109  
110      RealType distance = sqrt(pow(r12.x(), 2) + pow(r12.y(), 2));
111  
112 <    int whichRBin = distance / deltaR_;
112 >    int whichRBin = int(distance / deltaR_);
113  
114      if (distance <= len_) {
115      
116        RealType Z = fabs(r12.z());
117  
118        if (Z <= zLen_) {
119 <        int whichZBin = Z / deltaZ_;
119 >        int whichZBin = int(Z / deltaZ_);
120                
121          ++histogram_[whichRBin][whichZBin];        
122          ++npairs_;

Diff Legend

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