--- branches/development/src/rnemd/RNEMD.cpp 2012/11/16 21:39:55 1813 +++ branches/development/src/rnemd/RNEMD.cpp 2013/02/20 15:39:39 1850 @@ -35,7 +35,7 @@ * * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). - * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). + * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008). * [4] Vardeman & Gezelter, in progress (2009). */ @@ -1723,7 +1723,7 @@ namespace OpenMD { void RNEMD::writeReal(int index, unsigned int bin) { if (!doRNEMD_) return; assert(index >=0 && index < ENDINDEX); - assert(bin < nBins_); + assert(int(bin) < nBins_); RealType s; dynamic_cast(data_[index].accumulator[bin])->getAverage(s); @@ -1742,7 +1742,7 @@ namespace OpenMD { void RNEMD::writeVector(int index, unsigned int bin) { if (!doRNEMD_) return; assert(index >=0 && index < ENDINDEX); - assert(bin < nBins_); + assert(int(bin) < nBins_); Vector3d s; dynamic_cast(data_[index].accumulator[bin])->getAverage(s); if (isinf(s[0]) || isnan(s[0]) || @@ -1761,7 +1761,7 @@ namespace OpenMD { void RNEMD::writeRealStdDev(int index, unsigned int bin) { if (!doRNEMD_) return; assert(index >=0 && index < ENDINDEX); - assert(bin < nBins_); + assert(int(bin) < nBins_); RealType s; dynamic_cast(data_[index].accumulator[bin])->getStdDev(s); @@ -1780,7 +1780,7 @@ namespace OpenMD { void RNEMD::writeVectorStdDev(int index, unsigned int bin) { if (!doRNEMD_) return; assert(index >=0 && index < ENDINDEX); - assert(bin < nBins_); + assert(int(bin) < nBins_); Vector3d s; dynamic_cast(data_[index].accumulator[bin])->getStdDev(s); if (isinf(s[0]) || isnan(s[0]) ||