Updating to master

This commit is contained in:
Joel Clemmer
2021-02-05 17:01:32 -07:00
1424 changed files with 53674 additions and 56307 deletions

View File

@ -429,13 +429,13 @@ double NStencil::memory_usage()
bytes += memory->usage(stencil,maxstencil);
bytes += memory->usage(stencilxyz,maxstencil,3);
} else if (neighstyle == Neighbor::MULTI_OLD) {
bytes += atom->ntypes*maxstencil_multi_old * sizeof(int);
bytes += atom->ntypes*maxstencil_multi_old * sizeof(double);
bytes += (double)atom->ntypes*maxstencil_multi_old * sizeof(int);
bytes += (double)atom->ntypes*maxstencil_multi_old * sizeof(double);
} else if (neighstyle == Neighbor::MULTI) {
int n = ncollections;
for (int i = 0; i < n; i++) {
for (int j = 0; j < n; j++) {
bytes += maxstencil_multi[i][j] * sizeof(int);
bytes += (double)maxstencil_multi[i][j] * sizeof(int);
}
}
}