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

Comparing:
branches/development/src/applications/staticProps/SpatialStatistics.cpp (file contents), Revision 1875 by gezelter, Fri May 17 14:41:42 2013 UTC vs.
trunk/src/applications/staticProps/SpatialStatistics.cpp (file contents), Revision 1887 by gezelter, Tue Jun 18 17:48:52 2013 UTC

# Line 43 | Line 43
43   #include "applications/staticProps/SpatialStatistics.hpp"
44   #include "io/DumpReader.hpp"
45   #include "primitives/Molecule.hpp"
46 + #ifdef _MSC_VER
47 + #define isnan(x) _isnan((x))
48 + #define isinf(x) (!_finite(x) && !_isnan(x))
49 + #endif
50  
51   namespace OpenMD {
52    
# Line 137 | Line 141 | namespace OpenMD {
141        processStuntDouble( sd, bin );
142  
143        dynamic_cast<Accumulator *>(counts_->accumulator[bin])->add(1);
144 <    }      
144 >    }
145    }
146    
147  
# Line 319 | Line 323 | namespace OpenMD {
323    }
324  
325    SlabStatistics::~SlabStatistics() {
322    delete z_;
326    }
327  
328  
329    void SlabStatistics::processFrame(int istep) {
330      RealType z;
331 +
332      hmat_ = currentSnapshot_->getHmat();
333      for (int i = 0; i < nBins_; i++) {
334        z = (((RealType)i + 0.5) / (RealType)nBins_) * hmat_(2,2);
# Line 368 | Line 372 | namespace OpenMD {
372    }
373  
374    ShellStatistics::~ShellStatistics() {
371    delete r_;
375    }
376  
377    int ShellStatistics::getBin(Vector3d pos) {    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines