Commit fc031c34 authored by sjplimp's avatar sjplimp Committed by GitHub
Browse files

Merge pull request #40 from akohlmey/eam-fixes-for-scale

Eam fixes for scale
parents d730cda2 25917763
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ public:
  void init_style();
  void init_style();
  double single(int, int, int, int, double, double, double, double &);
  double single(int, int, int, int, double, double, double, double &);
  double memory_usage();
  double memory_usage();
  void *extract(const char *, int &) { return NULL; }


  int pack_forward_comm(int, int *, double *, int, int *);
  int pack_forward_comm(int, int *, double *, int, int *);
  void unpack_forward_comm(int, int, double *);
  void unpack_forward_comm(int, int, double *);
+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ public:
  void init_style();
  void init_style();
  double single(int, int, int, int, double, double, double, double &);
  double single(int, int, int, int, double, double, double, double &);
  double memory_usage();
  double memory_usage();
  void *extract(const char *, int &) { return NULL; }


  int pack_forward_comm(int, int *, double *, int, int *);
  int pack_forward_comm(int, int *, double *, int, int *);
  void unpack_forward_comm(int, int, double *);
  void unpack_forward_comm(int, int, double *);
+1 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ class PairEAMGPU : public PairEAM {
  void init_style();
  void init_style();
  double single(int, int, int, int, double, double, double, double &);
  double single(int, int, int, int, double, double, double, double &);
  double memory_usage();
  double memory_usage();
  void *extract(const char *, int &) { return NULL; }


  int pack_forward_comm(int, int *, double *, int, int *);
  int pack_forward_comm(int, int *, double *, int, int *);
  void unpack_forward_comm(int, int, double *);
  void unpack_forward_comm(int, int, double *);
+1 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ class PairEAMAlloyKokkos : public PairEAM {
  virtual ~PairEAMAlloyKokkos();
  virtual ~PairEAMAlloyKokkos();
  virtual void compute(int, int);
  virtual void compute(int, int);
  void init_style();
  void init_style();
  void *extract(const char *, int &) { return NULL; }
  void coeff(int, char **);
  void coeff(int, char **);


  KOKKOS_INLINE_FUNCTION
  KOKKOS_INLINE_FUNCTION
+1 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ class PairEAMFSKokkos : public PairEAM {
  virtual ~PairEAMFSKokkos();
  virtual ~PairEAMFSKokkos();
  virtual void compute(int, int);
  virtual void compute(int, int);
  void init_style();
  void init_style();
  void *extract(const char *, int &) { return NULL; }
  void coeff(int, char **);
  void coeff(int, char **);


  KOKKOS_INLINE_FUNCTION
  KOKKOS_INLINE_FUNCTION
Loading