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 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 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_;
# Line 133 | Line 133 | namespace OpenMD {
133        rdfStream << "#nRBins = " << nRBins_ << "\t maxLen = " << len_ << "deltaR = " << deltaR_ <<"\n";
134        rdfStream << "#nZBins =" << nZBins_ << "\t deltaZ = " << deltaZ_ << "\n";
135        for (unsigned int i = 0; i < avgGofr_.size(); ++i) {
136 <        RealType r = deltaR_ * (i + 0.5);
136 >        // RealType r = deltaR_ * (i + 0.5);
137  
138          for(unsigned int j = 0; j < avgGofr_[i].size(); ++j) {
139 <          RealType z = deltaZ_ * (j + 0.5);
139 >          // RealType z = deltaZ_ * (j + 0.5);
140            rdfStream << avgGofr_[i][j]/nProcessed_ << "\t";
141          }
142  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines