Updating to master

src/compute_property_local.cpp

@@ -650,8 +650,8 @@ void ComputePropertyLocal::reallocate(int n)
 
 double ComputePropertyLocal::memory_usage()
 {
-  double bytes = nmax*nvalues * sizeof(double);
-  bytes += nmax*2 * sizeof(int);
+  double bytes = (double)nmax*nvalues * sizeof(double);
+  bytes += (double)nmax*2 * sizeof(int);
   return bytes;
 }