ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/applications/staticProps/GofR.cpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/applications/staticProps/GofR.cpp (file contents):
Revision 2031 by tim, Tue Feb 15 17:11:35 2005 UTC vs.
Revision 2037 by tim, Wed Feb 16 19:36:30 2005 UTC

# Line 54 | Line 54 | GofR::GofR(SimInfo* info, const std::string& filename,
54      histogram_.resize(nRBins_);
55      avgGofr_.resize(nRBins_);
56  
57 <    setOutputName(getPrefix(filename) + ".gr");
57 >    setOutputName(getPrefix(filename) + ".gofr");
58   }
59  
60  
# Line 63 | Line 63 | void GofR::initalizeHistogram() {
63   }
64  
65   void GofR::initalizeHistogram() {
66 –    npairs_ = 0;
66      std::fill(histogram_.begin(), histogram_.end(), 0);
67   }
68  
69  
70   void GofR::processHistogram() {
71  
72 <    int nRealPairs = getNRealPairs();
72 >    int nPairs = getNPairs();
73      double volume = info_->getSnapshotManager()->getCurrentSnapshot()->getVolume();
74 <    double pairDensity = nRealPairs /volume;
74 >    double pairDensity = nPairs /volume * 2.0;
75      double pairConstant = ( 4.0 * NumericConstant::PI * pairDensity ) / 3.0;
76  
77      for(int i = 0 ; i < histogram_.size(); ++i){
# Line 102 | Line 101 | void GofR::collectHistogram(StuntDouble* sd1, StuntDou
101  
102      if (distance < len_) {
103          int whichBin = distance / deltaR_;
104 <        ++histogram_[whichBin];
106 <        ++npairs_;
104 >        histogram_[whichBin] += 2;
105      }
106   }
107  

Diff Legend

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