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

@ -1991,8 +1991,8 @@ void ComputeChunkAtom::set_arrays(int i)
double ComputeChunkAtom::memory_usage()
{
double bytes = 2*MAX(nmaxint,0) * sizeof(int); // ichunk,exclude
bytes += nmax * sizeof(double); // chunk
bytes += ncoord*nchunk * sizeof(double); // coord
if (compress) bytes += nchunk * sizeof(int); // chunkID
bytes += (double)nmax * sizeof(double); // chunk
bytes += (double)ncoord*nchunk * sizeof(double); // coord
if (compress) bytes += (double)nchunk * sizeof(int); // chunkID
return bytes;
}