--- trunk/src/rnemd/RNEMD.cpp	2012/08/22 02:28:28	1782
+++ trunk/src/rnemd/RNEMD.cpp	2012/08/29 20:52:19	1789
@@ -53,6 +53,11 @@
 #include <mpi.h>
 #endif
 
+#ifdef _MSC_VER
+#define isnan(x) _isnan((x))
+#define isinf(x) (!_finite(x) && !_isnan(x))
+#endif
+
 #define HONKING_LARGE_VALUE 1.0e10
 
 using namespace std;
@@ -65,7 +70,6 @@ namespace OpenMD {
     failTrialCount_ = 0;
     failRootCount_ = 0;
 
-    int seedValue;
     Globals * simParams = info->getSimParams();
     RNEMDParameters* rnemdParams = simParams->getRNEMDParameters();
 
@@ -305,7 +309,7 @@ namespace OpenMD {
     z.title =  "Z";
     z.dataType = "RealType";
     z.accumulator.reserve(nBins_);
-    for (unsigned int i = 0; i < nBins_; i++) 
+    for (int i = 0; i < nBins_; i++) 
       z.accumulator.push_back( new Accumulator() );
     data_[Z] = z;
     outputMap_["Z"] =  Z;
@@ -315,7 +319,7 @@ namespace OpenMD {
     temperature.title =  "Temperature";
     temperature.dataType = "RealType";
     temperature.accumulator.reserve(nBins_);
-    for (unsigned int i = 0; i < nBins_; i++) 
+    for (int i = 0; i < nBins_; i++) 
       temperature.accumulator.push_back( new Accumulator() );
     data_[TEMPERATURE] = temperature;
     outputMap_["TEMPERATURE"] =  TEMPERATURE;
@@ -325,7 +329,7 @@ namespace OpenMD {
     velocity.title =  "Velocity";  
     velocity.dataType = "Vector3d";
     velocity.accumulator.reserve(nBins_);
-    for (unsigned int i = 0; i < nBins_; i++) 
+    for (int i = 0; i < nBins_; i++) 
       velocity.accumulator.push_back( new VectorAccumulator() );
     data_[VELOCITY] = velocity;
     outputMap_["VELOCITY"] = VELOCITY;
@@ -335,7 +339,7 @@ namespace OpenMD {
     density.title =  "Density";
     density.dataType = "RealType";
     density.accumulator.reserve(nBins_);
-    for (unsigned int i = 0; i < nBins_; i++) 
+    for (int i = 0; i < nBins_; i++) 
       density.accumulator.push_back( new Accumulator() );
     data_[DENSITY] = density;
     outputMap_["DENSITY"] =  DENSITY;
@@ -1681,7 +1685,7 @@ namespace OpenMD {
       
       rnemdFile_.precision(8);
       
-      for (unsigned int j = 0; j < nBins_; j++) {        
+      for (int j = 0; j < nBins_; j++) {        
         
         for (unsigned int i = 0; i < outputMask_.size(); ++i) {
           if (outputMask_[i]) {
@@ -1707,7 +1711,7 @@ namespace OpenMD {
       rnemdFile_ << "#######################################################\n";
 
 
-      for (unsigned int j = 0; j < nBins_; j++) {        
+      for (int j = 0; j < nBins_; j++) {        
         rnemdFile_ << "#";
         for (unsigned int i = 0; i < outputMask_.size(); ++i) {
           if (outputMask_[i]) {