Unverified Commit 0183e999 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

consistently return "memory_usage" as double.

parent 101d3914

src/KOKKOS/atom_vec_angle_kokkos.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1724,9 +1724,9 @@ int AtomVecAngleKokkos::write_data_hybrid(FILE *fp, double *buf) 
   return # of bytes of allocated memory

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



bigint AtomVecAngleKokkos::memory_usage()

double AtomVecAngleKokkos::memory_usage()

{

  bigint bytes = 0;

  double bytes = 0;



  if (atom->memcheck("tag")) bytes += memory->usage(tag,nmax);

  if (atom->memcheck("type")) bytes += memory->usage(type,nmax);

src/KOKKOS/atom_vec_angle_kokkos.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ class AtomVecAngleKokkos : public AtomVecKokkos { 
  int pack_data_hybrid(int, double *);

  void write_data(FILE *, int, double **);

  int write_data_hybrid(FILE *, double *);

  bigint memory_usage();

  double memory_usage();



  void grow_pointers();

  int pack_comm_kokkos(const int &n, const DAT::tdual_int_2d &k_sendlist,

src/KOKKOS/atom_vec_atomic_kokkos.cpp

+2 −2
Original line number Diff line number Diff line
@@ -879,9 +879,9 @@ void AtomVecAtomicKokkos::write_data(FILE *fp, int n, double **buf) 
   return # of bytes of allocated memory

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



bigint AtomVecAtomicKokkos::memory_usage()

double AtomVecAtomicKokkos::memory_usage()

{

  bigint bytes = 0;

  double bytes = 0;



  if (atom->memcheck("tag")) bytes += memory->usage(tag,nmax);

  if (atom->memcheck("type")) bytes += memory->usage(type,nmax);

src/KOKKOS/atom_vec_atomic_kokkos.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ class AtomVecAtomicKokkos : public AtomVecKokkos { 
  void data_atom(double *, tagint, char **);

  void pack_data(double **);

  void write_data(FILE *, int, double **);

  bigint memory_usage();

  double memory_usage();



  void grow_pointers();

  int pack_border_kokkos(int n, DAT::tdual_int_2d k_sendlist,

src/KOKKOS/atom_vec_bond_kokkos.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1148,9 +1148,9 @@ int AtomVecBondKokkos::write_data_hybrid(FILE *fp, double *buf) 
   return # of bytes of allocated memory

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



bigint AtomVecBondKokkos::memory_usage()

double AtomVecBondKokkos::memory_usage()

{

  bigint bytes = 0;

  double bytes = 0;



  if (atom->memcheck("tag")) bytes += memory->usage(tag,nmax);

  if (atom->memcheck("type")) bytes += memory->usage(type,nmax);

CRA Git | Maintained and supported by SUSTech CRA and CCSE