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

Comparing trunk/src/applications/staticProps/GofXyz.cpp (file contents):
Revision 2070 by gezelter, Sun Jun 16 15:15:42 2013 UTC vs.
Revision 2071 by gezelter, Sat Mar 7 21:41:51 2015 UTC

# Line 48 | Line 48 | namespace OpenMD {
48   #include "types/MultipoleAdapter.hpp"
49  
50   namespace OpenMD {
51 <
52 <  GofXyz::GofXyz(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, const std::string& sele3, RealType len, int nrbins)
53 <    : RadialDistrFunc(info, filename, sele1, sele2), evaluator3_(info), seleMan3_(info), len_(len), halfLen_(len/2), nRBins_(nrbins) {
54 <      setOutputName(getPrefix(filename) + ".gxyz");
55 <
56 <      evaluator3_.loadScriptString(sele3);
57 <      if (!evaluator3_.isDynamic()) {
58 <        seleMan3_.setSelectionSet(evaluator3_.evaluate());
59 <      }    
60 <
61 <      deltaR_ =  len_ / nRBins_;
51 >  
52 >  GofXyz::GofXyz(SimInfo* info, const std::string& filename,
53 >                 const std::string& sele1, const std::string& sele2,
54 >                 const std::string& sele3, RealType len, int nrbins)
55 >    : RadialDistrFunc(info, filename, sele1, sele2), len_(len),
56 >      halfLen_(len/2), nRBins_(nrbins), evaluator3_(info), seleMan3_(info) {
57      
58 <      histogram_.resize(nRBins_);
59 <      for (int i = 0 ; i < nRBins_; ++i) {
60 <        histogram_[i].resize(nRBins_);
61 <        for(int j = 0; j < nRBins_; ++j) {
62 <          histogram_[i][j].resize(nRBins_);
63 <        }
64 <      }  
65 <  
66 <    }
67 <
68 <
58 >    setOutputName(getPrefix(filename) + ".gxyz");
59 >    
60 >    evaluator3_.loadScriptString(sele3);
61 >    if (!evaluator3_.isDynamic()) {
62 >      seleMan3_.setSelectionSet(evaluator3_.evaluate());
63 >    }    
64 >    
65 >    deltaR_ =  len_ / nRBins_;
66 >    
67 >    histogram_.resize(nRBins_);
68 >    for (int i = 0 ; i < nRBins_; ++i) {
69 >      histogram_[i].resize(nRBins_);
70 >      for(int j = 0; j < nRBins_; ++j) {
71 >        histogram_[i][j].resize(nRBins_);
72 >      }
73 >    }    
74 >  }
75 >  
76    void GofXyz::preProcess() {
77      for (int i = 0 ; i < nRBins_; ++i) {
78        histogram_[i].resize(nRBins_);
# Line 79 | Line 81 | namespace OpenMD {
81        }
82      }  
83    }
84 <
85 <
84 >  
85 >  
86    void GofXyz::initializeHistogram() {
87 <    //calculate the center of mass of the molecule of selected stuntdouble in selection1
88 <
87 >    // Calculate the center of mass of the molecule of selected
88 >    // StuntDouble in selection1
89 >    
90      if (!evaluator3_.isDynamic()) {
91        seleMan3_.setSelectionSet(evaluator3_.evaluate());
92      }    
93  
94      assert(seleMan1_.getSelectionCount() == seleMan3_.getSelectionCount());
95      
96 <    //dipole direction of selection3 and position of selection3 will be used to determine the y-z plane
97 <    //v1 = s3 -s1,
98 <    //z = origin.dipole
99 <    //x = v1 X z
100 <    //y = z X x
96 >    // The Dipole direction of selection3 and position of selection3 will
97 >    // be used to determine the y-z plane
98 >    // v1 = s3 -s1,
99 >    // z = origin.dipole
100 >    // x = v1 X z
101 >    // y = z X x
102      rotMats_.clear();
103  
104      int i;
# Line 169 | Line 173 | namespace OpenMD {
173        //rdfStream << "#g(x, y, z)\n";
174        //rdfStream << "#selection1: (" << selectionScript1_ << ")\t";
175        //rdfStream << "selection2: (" << selectionScript2_ << ")\n";
176 <      //rdfStream << "#nRBins = " << nRBins_ << "\t maxLen = " << len_ << "deltaR = " << deltaR_ <<"\n";
176 >      //rdfStream << "#nRBins = " << nRBins_ << "\t maxLen = "
177 >      //          << len_ << "deltaR = " << deltaR_ <<"\n";
178        for (unsigned int i = 0; i < histogram_.size(); ++i) {
179          for(unsigned int j = 0; j < histogram_[i].size(); ++j) {
180            for(unsigned int k = 0;k < histogram_[i][j].size(); ++k) {
181 <            rdfStream.write(reinterpret_cast<char *>(&histogram_[i][j][k] ),
182 <                            sizeof(histogram_[i][j][k] ));
181 >            rdfStream.write(reinterpret_cast<char *>( &histogram_[i][j][k] ),
182 >                            sizeof( histogram_[i][j][k] ));
183            }
184          }
185        }
186          
187      } else {
188  
189 <      sprintf(painCave.errMsg, "GofXyz: unable to open %s\n", outputFilename_.c_str());
189 >      sprintf(painCave.errMsg, "GofXyz: unable to open %s\n",
190 >              outputFilename_.c_str());
191        painCave.isFatal = 1;
192        simError();  
193      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines