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

Comparing trunk/OOPSE-2.0/src/applications/staticProps/RhoZ.cpp (file contents):
Revision 2544 by tim, Wed Jan 11 19:01:20 2006 UTC vs.
Revision 2600 by khaygart, Fri Mar 3 21:05:34 2006 UTC

# Line 44 | Line 44
44   *
45   *  Created by Charles F. Vardeman II on 11/26/05.
46   *  @author  Charles F. Vardeman II
47 < *  @version $Id: RhoZ.cpp,v 1.3 2006-01-11 19:01:20 tim Exp $
47 > *  @version $Id: RhoZ.cpp,v 1.4 2006-03-03 21:05:34 khaygart Exp $
48   *
49   */
50  
# Line 59 | Line 59 | namespace oopse {
59   namespace oopse {
60    
61    RhoZ::RhoZ(SimInfo* info, const std::string& filename, const std::string& sele, int len, int nrbins)
62 <  : StaticAnalyser(info, filename), selectionScript_(sele),  evaluator_(info), seleMan_(info), len_(len), nRBins_(nrbins){
62 >    : StaticAnalyser(info, filename), selectionScript_(sele),  evaluator_(info), seleMan_(info), len_(len), nRBins_(nrbins){
63  
64      evaluator_.loadScriptString(sele);
65      if (!evaluator_.isDynamic()) {
# Line 78 | Line 78 | namespace oopse {
78    void RhoZ::process() {
79      DumpReader reader(info_, dumpFilename_);    
80      int nFrames = reader.getNFrames();
81 <    nProcessed_ = nFrames / step_;
81 >    nProcessed_ = nFrames/step_;
82  
83
83      for (int istep = 0; istep < nFrames; istep += step_) {
84  
85 <        StuntDouble* sd;
86 <        int i;    
87 <        reader.readFrame(istep);
88 <        currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
85 >      int i;    
86 >      for (i=0; i < nRBins_; i++) {
87 >        sliceSDLists_[i].clear();
88 >      }
89  
90 <        double sliceVolume = currentSnapshot_->getVolume() /nRBins_;
91 <        //assume simulation box will never change
92 <        //Mat3x3d hmat = currentSnapshot_->getHmat();
93 <        double halfBoxZ = len_ /2;      
90 >      StuntDouble* sd;
91 >      reader.readFrame(istep);
92 >      currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
93 >      
94 >      double sliceVolume = currentSnapshot_->getVolume() /nRBins_;
95 >      //assume simulation box will never change
96 >      //Mat3x3d hmat = currentSnapshot_->getHmat();
97 >      double halfBoxZ_ = len_ /2;      
98          
99          if (evaluator_.isDynamic()) {
100            seleMan_.setSelectionSet(evaluator_.evaluate());
# Line 107 | Line 110 | namespace oopse {
110          //determine which atom belongs to which slice
111          for (sd = seleMan_.beginSelected(i); sd != NULL; sd = seleMan_.nextSelected(i)) {
112             Vector3d pos = sd->getPos();
113 <           int binNo = (pos.z() + halfBoxZ) /deltaR_;
113 >           int binNo = (pos.z() + halfBoxZ_) /deltaR_;
114             sliceSDLists_[binNo].push_back(sd);
115          }
116  
117          //loop over the slices to calculate the densities
118 <        for (std::size_t j = 0; j < sliceSDLists_.size(); ++j) {
118 >        for (i = 0; i < nRBins_; i++) {
119              double totalMass = 0;
120 <            for (int k = 0; k < sliceSDLists_[j].size(); ++k) {
121 <                totalMass += sliceSDLists_[j][k]->getMass();
120 >            for (int k = 0; k < sliceSDLists_[i].size(); ++k) {
121 >                totalMass += sliceSDLists_[i][k]->getMass();
122              }
123 <            density_[j] += totalMass/sliceVolume;
123 >            density_[i] += totalMass/sliceVolume;
124          }
125      }
126  
124    
127      writeDensity();
128  
129    }
# Line 132 | Line 134 | namespace oopse {
134      std::ofstream rdfStream(outputFilename_.c_str());
135      if (rdfStream.is_open()) {
136        rdfStream << "#RhoZ\n";
137 <      rdfStream << "#selection: (" << selectionScript_ << ")\t";
137 >      rdfStream << "#nFrames:\t" << nProcessed_ << "\n";
138 >      rdfStream << "#selection: (" << selectionScript_ << ")\n";
139        rdfStream << "#z\tdensity\n";
140        for (int i = 0; i < density_.size(); ++i) {
141 <        double r = deltaR_ * (i + 0.5);
142 <        rdfStream << r << "\t" << density_[i]/nProcessed_ << "\n";
141 >        double r = deltaR_ * (i + 0.5)-82;
142 >        rdfStream << r << "\t" << 1.660535*density_[i]/nProcessed_ << "\n";
143        }
144        
145      } else {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines