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

Comparing trunk/OOPSE-4/src/applications/staticProps/GofRAngle.cpp (file contents):
Revision 2012 by tim, Sun Feb 13 20:36:24 2005 UTC vs.
Revision 2040 by tim, Wed Feb 16 21:00:39 2005 UTC

# Line 46 | Line 46 | GofRAngle::GofRAngle(SimInfo* info, const std::string&
46  
47   namespace oopse {
48  
49 < GofRAngle::GofRAngle(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2)
50 <    : RadialDistrFunc(info, filename, sele1, sele2){
49 > GofRAngle::GofRAngle(SimInfo* info, const std::string& filename, const std::string& sele1,
50 >    const std::string& sele2, double len, int nrbins, int nangleBins)
51 >    : RadialDistrFunc(info, filename, sele1, sele2), len_(len), nRBins_(nrbins), nAngleBins_(nangleBins){
52  
53 +    deltaR_ = len_ /nRBins_;            
54 +    deltaCosAngle_ = 2.0 / nAngleBins_;    
55 +
56 +    histogram_.resize(nRBins_);
57 +    avgGofr_.resize(nRBins_);
58 +    for (int i = 0 ; i < nRBins_; ++i) {
59 +        histogram_[i].resize(nAngleBins_);
60 +        avgGofr_[i].resize(nAngleBins_);
61 +    }
62   }
63  
64  
# Line 68 | Line 78 | void GofRAngle::processHistogram() {
78  
79   void GofRAngle::processHistogram() {
80  
81 +    int nPairs = getNPairs();
82      double volume = info_->getSnapshotManager()->getCurrentSnapshot()->getVolume();
83 <    double pairDensity = npairs_ /volume;
83 >    double pairDensity = nPairs /volume;
84      double pairConstant = ( 4.0 * NumericConstant::PI * pairDensity ) / 3.0;
85  
86      for(int i = 0 ; i < histogram_.size(); ++i){
# Line 121 | Line 132 | void GofRAngle::writeRdf() {
132              double r = deltaR_ * (i + 0.5);
133  
134              for(int j = 0; j < avgGofr_[i].size(); ++j) {
135 <                double cosAngle = -1.0 + (i + 0.5)*deltaCosAngle_;
135 >                double cosAngle = -1.0 + (j + 0.5)*deltaCosAngle_;
136                  rdfStream << r << "\t" << cosAngle << "\t" << avgGofr_[i][j]/nProcessed_ << "\n";
137              }
138          }

Diff Legend

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