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

Comparing branches/development/src/applications/staticProps/GofZ.cpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1794 by gezelter, Thu Sep 6 19:44:06 2012 UTC

# Line 64 | Line 64 | namespace OpenMD {
64      std::fill(avgGofz_.begin(), avgGofz_.end(), 0.0);    
65    }
66  
67 <  void GofZ::initalizeHistogram() {
67 >  void GofZ::initializeHistogram() {
68      std::fill(histogram_.begin(), histogram_.end(), 0);
69    }
70  
# Line 76 | Line 76 | namespace OpenMD {
76      RealType pairDensity = nPairs /volume * 2.0;
77      RealType pairConstant = ( 2.0 * NumericConstant::PI * pairDensity );
78  
79 <    for(int i = 0 ; i < histogram_.size(); ++i){
79 >    for(unsigned int i = 0 ; i < histogram_.size(); ++i){
80  
81        RealType zLower = i * deltaZ_;
82        RealType zUpper = zLower + deltaZ_;
# Line 108 | Line 108 | namespace OpenMD {
108  
109      if (xydist < rC_) {
110        thisZ = abs(r12.z());
111 <      int whichBin = thisZ / deltaZ_;
111 >      int whichBin = int(thisZ / deltaZ_);
112        histogram_[whichBin] += 2;
113      }
114    }
# Line 121 | Line 121 | namespace OpenMD {
121        rdfStream << "#selection1: (" << selectionScript1_ << ")\t";
122        rdfStream << "selection2: (" << selectionScript2_ << ")\n";
123        rdfStream << "#r\tcorrValue\n";
124 <      for (int i = 0; i < avgGofz_.size(); ++i) {
124 >      for (unsigned int i = 0; i < avgGofz_.size(); ++i) {
125          RealType z = deltaZ_ * (i + 0.5);
126          rdfStream << z << "\t" << avgGofz_[i]/nProcessed_ << "\n";
127        }

Diff Legend

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