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

Comparing trunk/src/applications/sequentialProps/ContactAngle2.cpp (file contents):
Revision 2035 by gezelter, Tue Nov 4 15:31:51 2014 UTC vs.
Revision 2036 by gezelter, Tue Nov 4 16:20:31 2014 UTC

# Line 138 | Line 138 | namespace OpenMD {
138        }
139      }
140  
141 <    for (unsigned int i = 0; i < histo.size(); ++i) {
142 <      RealType ther = dr * (i + 0.5);
143 <      for(unsigned int j = 0; j < histo[i].size(); ++j) {
144 <        if (histo[i][j] <= threshDens_) {
145 <          RealType thez = dz * (j + 0.5);
146 <          cerr << ther << "\t" << thez << "\n";
147 <          break;
141 >    for (unsigned int j = 0; j < nZBins_;  ++j) {
142 >      RealType thez = dz * (j + 0.5);
143 >      bool aboveThresh = false;
144 >      for (unsigned int i = 0; i < nRBins_;  ++i) {
145 >        RealType ther = dr * (i + 0.5);
146 >        if (histo[i][j] >= threshDens_) aboveThresh = true;
147 >
148 >        if (aboveThresh && (histo[i][j] <= threshDens_)) {
149 >          cerr << thez << "\t" << ther << "\n";
150 >          break;        
151          }
152        }
153      }
154 <
154 >    
155      // values_.push_back( acos(maxct)*(180.0/M_PI) );
156      
157    }  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines