ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into symbolic-atom-constants

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-09-15 14:58:13 -04:00
parent 828ce84df5 2165f6ed38
commit 618b08dcfc
459 changed files with 11521 additions and 10514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/atom_vec.cpp
View File

@ -2306,12 +2306,12 @@ void AtomVec::write_improper(FILE *fp, int n, tagint **buf, int index)
return # of bytes of allocated memory
------------------------------------------------------------------------- */
bigint AtomVec::memory_usage()
double AtomVec::memory_usage()
{
int datatype,cols,maxcols;
void *pdata;
bigint bytes = 0;
double bytes = 0;
bytes += memory->usage(tag,nmax);
bytes += memory->usage(type,nmax);