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

Comparing trunk/src/applications/staticProps/GofRAngle.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 68 | Line 68 | namespace OpenMD {
68      }
69    }
70  
71 <  void GofRAngle::initalizeHistogram() {
71 >  void GofRAngle::initializeHistogram() {
72      npairs_ = 0;
73      for (unsigned int i = 0; i < histogram_.size(); ++i){
74        std::fill(histogram_[i].begin(), histogram_[i].end(), 0);
# Line 107 | Line 107 | namespace OpenMD {
107        currentSnapshot_->wrapVector(r12);
108  
109      RealType distance = r12.length();
110 <    int whichRBin = distance / deltaR_;
110 >    int whichRBin = int(distance / deltaR_);
111  
112      if (distance <= len_) {
113  
114        RealType cosAngle = evaluateAngle(sd1, sd2);
115        RealType halfBin = (nAngleBins_ - 1) * 0.5;
116 <      int whichThetaBin = halfBin * (cosAngle + 1.0);
116 >      int whichThetaBin = int(halfBin * (cosAngle + 1.0));
117        ++histogram_[whichRBin][whichThetaBin];
118          
119        ++npairs_;

Diff Legend

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