Commit ba434652 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'collected-small-changes' of github.com:akohlmey/lammps into collected-small-changes

parents 09c61ca5 0f971bf0

lib/gpu/lal_lj_expand_ext.cpp

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ int lje_gpu_init(const int ntypes, double **cutsq, double **host_lj1, 
// ---------------------------------------------------------------------------

// Copy updated coeffs from host to device

// ---------------------------------------------------------------------------

int lje_gpu_reinit(const int ntypes, double **cutsq, double **host_lj1,

void lje_gpu_reinit(const int ntypes, double **cutsq, double **host_lj1,

                   double **host_lj2, double **host_lj3, double **host_lj4,

                   double **offset, double **shift) {

  int world_me=LJEMF.device->world_me();

src/GPU/pair_gauss_gpu.cpp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ int gauss_gpu_init(const int ntypes, double **cutsq, double **host_a, 
                   double **b, double **offset, double *special_lj, const int nlocal,

                   const int nall, const int max_nbors, const int maxspecial,

                   const double cell_size, int &gpu_mode, FILE *screen);

int gauss_gpu_reinit(const int ntypes, double **cutsq, double **host_a,

void gauss_gpu_reinit(const int ntypes, double **cutsq, double **host_a,

                   double **b, double **offset);

void gauss_gpu_clear();

int ** gauss_gpu_compute_n(const int ago, const int inum,

src/GPU/pair_lj_cut_coul_long_gpu.cpp

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ int ljcl_gpu_init(const int ntypes, double **cutsq, double **host_lj1, 
                  double **host_cut_ljsq, double host_cut_coulsq,

                  double *host_special_coul, const double qqrd2e,

                  const double g_ewald);

int ljcl_gpu_reinit(const int ntypes, double **cutsq, double **host_lj1,

void ljcl_gpu_reinit(const int ntypes, double **cutsq, double **host_lj1,

                    double **host_lj2, double **host_lj3, double **host_lj4,

                    double **offset, double **host_lj_cutsq);

void ljcl_gpu_clear();

src/GPU/pair_lj_cut_gpu.cpp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int ljl_gpu_init(const int ntypes, double **cutsq, double **host_lj1, 
                 const int nall, const int max_nbors, const int maxspecial,

                 const double cell_size, int &gpu_mode, FILE *screen);



int ljl_gpu_reinit(const int ntypes, double **cutsq, double **host_lj1,

void ljl_gpu_reinit(const int ntypes, double **cutsq, double **host_lj1,

                   double **host_lj2, double **host_lj3, double **host_lj4,

                   double **offset);

src/GPU/pair_lj_expand_gpu.cpp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int lje_gpu_init(const int ntypes, double **cutsq, double **host_lj1, 
                 const int nlocal, const int nall, const int max_nbors,

                 const int maxspecial, const double cell_size, int &gpu_mode,

                 FILE *screen);

int lje_gpu_reinit(const int ntypes, double **cutsq, double **host_lj1,

void lje_gpu_reinit(const int ntypes, double **cutsq, double **host_lj1,

                   double **host_lj2, double **host_lj3, double **host_lj4,

                   double **offset, double **shift);

void lje_gpu_clear();

CRA Git | Maintained and supported by SUSTech CRA and CCSE