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

Comparing branches/development/src/applications/staticProps/BondOrderParameter.cpp (file contents):
Revision 1793 by gezelter, Fri Jul 6 22:01:58 2012 UTC vs.
Revision 1794 by gezelter, Thu Sep 6 19:44:06 2012 UTC

# Line 135 | Line 135 | namespace OpenMD {
135      m2Max.clear();
136    }
137    
138 <  void BondOrderParameter::initalizeHistogram() {
138 >  void BondOrderParameter::initializeHistogram() {
139      for (int bin = 0; bin < nBins_; bin++) {
140        for (int l = 0; l <= lMax_; l++) {
141          Q_histogram_[std::make_pair(bin,l)] = 0;
# Line 339 | Line 339 | namespace OpenMD {
339  
340      for (int l = 0; l <= lMax_; l++) {
341        if (q[l] >= MinQ_ && q[l] < MaxQ_) {
342 <        int qbin = (q[l] - MinQ_) / deltaQ_;
342 >        int qbin = int((q[l] - MinQ_) / deltaQ_);
343          Q_histogram_[std::make_pair(qbin,l)] += 1;
344          Qcount_[l]++;      
345        } else {
# Line 353 | Line 353 | namespace OpenMD {
353  
354      for (int l = 0; l <= lMax_; l++) {
355        if (real(what[l]) >= MinW_ && real(what[l]) < MaxW_) {
356 <        int wbin = (real(what[l]) - MinW_) / deltaW_;
356 >        int wbin = int((real(what[l]) - MinW_) / deltaW_);
357          W_histogram_[std::make_pair(wbin,l)] += 1;
358          Wcount_[l]++;      
359        } else {

Diff Legend

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