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

2007-10-04 17:57:04 +00:00
parent ab2a54ab6a
commit aef3f32236
145 changed files with 401 additions and 442 deletions
--- a/src/atom_vec_atomic.cpp
+++ b/src/atom_vec_atomic.cpp
@ -444,9 +444,9 @@ int AtomVecAtomic::data_atom_hybrid(int nlocal, char **values)
   return # of bytes of allocated memory 
 ------------------------------------------------------------------------- */

-int AtomVecAtomic::memory_usage()
+double AtomVecAtomic::memory_usage()
 {
-  int bytes = 0;
+  double bytes = 0.0;

  if (atom->memcheck("tag")) bytes += nmax * sizeof(int);
  if (atom->memcheck("type")) bytes += nmax * sizeof(int);