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

Comparing:
branches/development/src/utils/Grid3d.hpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
trunk/src/utils/Grid3d.hpp (file contents), Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

# Line 35 | Line 35
35   *                                                                      
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 < * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
# Line 99 | Line 99 | namespace OpenMD {
99    private:
100      
101      int isValidGrid(unsigned int i, unsigned int j, unsigned int k) const {
102 <      int index = i * dim2_*dim3_ + j * dim3_ + k;
103 <      return index < data_.size() ? index : -1;
102 >      unsigned int index = i * dim2_*dim3_ + j * dim3_ + k;
103 >      return index < data_.size() ? int(index) : -1;
104      };
105      
106      unsigned int dim1_;

Diff Legend

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