Commit 7d398e21 authored by sjplimp's avatar sjplimp
Browse files 

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

src/MEAM/pair_meam.cpp

+2 −2
Original line number Diff line number Diff line
@@ -890,9 +890,9 @@ void PairMEAM::unpack_reverse_comm(int n, int *list, double *buf) 
   memory usage of local atom-based arrays 

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



int PairMEAM::memory_usage()

double PairMEAM::memory_usage()

{

  int bytes = 7 * nmax * sizeof(double);

  double bytes = 7 * nmax * sizeof(double);

  bytes += (3 + 6 + 10 + 3 + 3) * nmax * sizeof(double);

  bytes += 3*3 * nmax * sizeof(double);

  bytes += 2 * maxneigh * sizeof(double);

src/MEAM/pair_meam.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class PairMEAM : public Pair { 
  void unpack_comm(int, int, double *);

  int pack_reverse_comm(int, int, double *);

  void unpack_reverse_comm(int, int *, double *);

  int memory_usage();

  double memory_usage();



 private:

  double cutmax;                // max cutoff for all elements

src/POEMS/fix_poems.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1540,10 +1540,10 @@ void FixPOEMS::copy_arrays(int i, int j) 
   memory usage of local atom-based arrays 

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



int FixPOEMS::memory_usage()

double FixPOEMS::memory_usage()

{

  int nmax = atom->nmax;

  int bytes = nmax * sizeof(int);

  int double = nmax * sizeof(int);

  bytes += nmax*MAXBODY * sizeof(int);

  bytes += nmax*3 * sizeof(double);

  return bytes;

src/POEMS/fix_poems.h

+1 −1
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ class FixPOEMS : public Fix { 


  void grow_arrays(int);

  void copy_arrays(int, int);

  int memory_usage();

  int pack_exchange(int, double *);

  int unpack_exchange(int, double *);

  double memory_usage();



  void pre_neighbor();

  int dof(int);

src/USER-ACKLAND/compute_ackland_atom.cpp

+2 −2
Original line number Diff line number Diff line
@@ -378,8 +378,8 @@ void ComputeAcklandAtom::select2(int k, int n, double *arr, int *iarr) 
   memory usage of local atom-based array

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



int ComputeAcklandAtom::memory_usage()

double ComputeAcklandAtom::memory_usage()

{

  int bytes = nmax * sizeof(double);

  double bytes = nmax * sizeof(double);

  return bytes;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE