git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@951 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp
2007-10-04 17:57:04 +00:00
parent ab2a54ab6a
commit aef3f32236
145 changed files with 401 additions and 442 deletions

View File

@ -1282,13 +1282,13 @@ void Atom::update_callback(int ifix)
add in global to local mapping storage
------------------------------------------------------------------------- */
int Atom::memory_usage()
double Atom::memory_usage()
{
memlength = DELTA_MEMSTR;
memstr = (char *) memory->smalloc(memlength*sizeof(char),"atom:memstr");
memstr[0] = '\0';
int bytes = avec->memory_usage();
double bytes = avec->memory_usage();
if (map_style == 1)
bytes += map_tag_max * sizeof(int);
else if (map_style == 2) {