ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/utils/Accumulator.hpp
(Generate patch)

Comparing trunk/src/utils/Accumulator.hpp (file contents):
Revision 1979 by gezelter, Sat Apr 5 20:56:01 2014 UTC vs.
Revision 1980 by gezelter, Sat Apr 5 21:17:12 2014 UTC

# Line 176 | Line 176 | namespace OpenMD {
176        assert(Count_ != 0);
177        RealType sd;
178        this->getStdDev(sd);
179 <      ret = 1.960 * sd / sqrt(Count_);
179 >      ret = 1.960 * sd / sqrt(RealType(Count_));
180        return;
181      }
182  
# Line 289 | Line 289 | namespace OpenMD {
289        assert(Count_ != 0);
290        ResultType sd;
291        this->getStdDev(sd);
292 <      ret[0] = 1.960 * sd[0] / sqrt(Count_);
293 <      ret[1] = 1.960 * sd[1] / sqrt(Count_);
294 <      ret[2] = 1.960 * sd[2] / sqrt(Count_);
292 >      ret[0] = 1.960 * sd[0] / sqrt(RealType(Count_));
293 >      ret[1] = 1.960 * sd[1] / sqrt(RealType(Count_));
294 >      ret[2] = 1.960 * sd[2] / sqrt(RealType(Count_));
295        return;
296      }
297  
# Line 355 | Line 355 | namespace OpenMD {
355        assert(Count_ != 0);
356        RealType sd;
357        this->getLengthStdDev(sd);
358 <      ret = 1.960 * sd / sqrt(Count_);
358 >      ret = 1.960 * sd / sqrt(RealType(Count_));
359        return;
360      }
361  
# Line 465 | Line 465 | namespace OpenMD {
465        this->getStdDev(sd);
466        for (unsigned int i = 0; i < 3; i++) {
467          for (unsigned int j = 0; j < 3; j++) {
468 <          ret(i,j) = 1.960 * sd(i,j) / sqrt(Count_);
468 >          ret(i,j) = 1.960 * sd(i,j) / sqrt(RealType(Count_));
469          }
470        }
471        return;

Diff Legend

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