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 1785 by jmichalk, Wed Aug 22 18:43:27 2012 UTC vs.
Revision 1796 by gezelter, Mon Sep 10 18:38:44 2012 UTC

# 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_;
# Line 129 | Line 129 | namespace OpenMD {
129        rdfStream << "#nRBins = " << nRBins_ << "\t maxLen = " << len_ << "deltaR = " << deltaR_ <<"\n";
130        rdfStream << "#nAngleBins =" << nAngleBins_ << "deltaCosAngle = " << deltaCosAngle_ << "\n";
131        for (unsigned int i = 0; i < avgGofr_.size(); ++i) {
132 <        RealType r = deltaR_ * (i + 0.5);
132 >        // RealType r = deltaR_ * (i + 0.5);
133  
134          for(unsigned int j = 0; j < avgGofr_[i].size(); ++j) {
135 <          RealType cosAngle = -1.0 + (j + 0.5)*deltaCosAngle_;
135 >          // RealType cosAngle = -1.0 + (j + 0.5)*deltaCosAngle_;
136            rdfStream << avgGofr_[i][j]/nProcessed_ << "\t";
137          }
138  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines