Merge branch 'master' into symbolic-atom-constants

2020-09-15 14:58:13 -04:00
parent 828ce84df5 2165f6ed38
commit 618b08dcfc
459 changed files with 11521 additions and 10514 deletions
--- a/src/atom_vec_hybrid.cpp
+++ b/src/atom_vec_hybrid.cpp
@ -379,9 +379,9 @@ int AtomVecHybrid::unpack_restart_bonus(int ilocal, double *buf)

 /* ---------------------------------------------------------------------- */

-bigint AtomVecHybrid::memory_usage_bonus()
+double AtomVecHybrid::memory_usage_bonus()
 {
-  bigint bytes = 0;
+  double bytes = 0;
  for (int k = 0; k < nstyles_bonus; k++)
    bytes += styles_bonus[k]->memory_usage_bonus();
  return bytes;