make *_gpu_reinit() functions consistent in returning void. correct prototypes in src/GPU, too.
this supersedes and closes #719
This commit is contained in:
@ -92,7 +92,7 @@ int lje_gpu_init(const int ntypes, double **cutsq, double **host_lj1,
|
|||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Copy updated coeffs from host to device
|
// 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 **host_lj2, double **host_lj3, double **host_lj4,
|
||||||
double **offset, double **shift) {
|
double **offset, double **shift) {
|
||||||
int world_me=LJEMF.device->world_me();
|
int world_me=LJEMF.device->world_me();
|
||||||
|
|||||||
@ -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,
|
double **b, double **offset, double *special_lj, const int nlocal,
|
||||||
const int nall, const int max_nbors, const int maxspecial,
|
const int nall, const int max_nbors, const int maxspecial,
|
||||||
const double cell_size, int &gpu_mode, FILE *screen);
|
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);
|
double **b, double **offset);
|
||||||
void gauss_gpu_clear();
|
void gauss_gpu_clear();
|
||||||
int ** gauss_gpu_compute_n(const int ago, const int inum,
|
int ** gauss_gpu_compute_n(const int ago, const int inum,
|
||||||
|
|||||||
@ -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_cut_ljsq, double host_cut_coulsq,
|
||||||
double *host_special_coul, const double qqrd2e,
|
double *host_special_coul, const double qqrd2e,
|
||||||
const double g_ewald);
|
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 **host_lj2, double **host_lj3, double **host_lj4,
|
||||||
double **offset, double **host_lj_cutsq);
|
double **offset, double **host_lj_cutsq);
|
||||||
void ljcl_gpu_clear();
|
void ljcl_gpu_clear();
|
||||||
|
|||||||
@ -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 int nall, const int max_nbors, const int maxspecial,
|
||||||
const double cell_size, int &gpu_mode, FILE *screen);
|
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 **host_lj2, double **host_lj3, double **host_lj4,
|
||||||
double **offset);
|
double **offset);
|
||||||
|
|
||||||
|
|||||||
@ -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 nlocal, const int nall, const int max_nbors,
|
||||||
const int maxspecial, const double cell_size, int &gpu_mode,
|
const int maxspecial, const double cell_size, int &gpu_mode,
|
||||||
FILE *screen);
|
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 **host_lj2, double **host_lj3, double **host_lj4,
|
||||||
double **offset, double **shift);
|
double **offset, double **shift);
|
||||||
void lje_gpu_clear();
|
void lje_gpu_clear();
|
||||||
|
|||||||
Reference in New Issue
Block a user