Merge remote-tracking branch 'github/master' into arg-info-class

This commit is contained in:
Axel Kohlmeyer
2021-02-03 17:43:49 -05:00
163 changed files with 600 additions and 611 deletions

View File

@ -499,7 +499,7 @@ void ComputeReduceChunk::unlock(Fix *fixptr)
double ComputeReduceChunk::memory_usage()
{
double bytes = (bigint) maxatom * sizeof(double);
if (nvalues == 1) bytes += (bigint) maxchunk * 2 * sizeof(double);
else bytes += (bigint) maxchunk * nvalues * 2 * sizeof(double);
if (nvalues == 1) bytes += (double) maxchunk * 2 * sizeof(double);
else bytes += (double) maxchunk * nvalues * 2 * sizeof(double);
return bytes;
}