Commit ebfe7f68 authored by Trung Nguyen's avatar Trung Nguyen
Browse files

More cleanup

parent c488e620
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -250,8 +250,8 @@ void TersoffT::loop(const bool _eflag, const bool _vflag, const int evatom) {
                               (BX/this->_threads_per_atom)));

  this->k_short_nbor.set_size(GX,BX);
  this->k_short_nbor.run(&this->atom->x, &elem2param, &_nelements, &_nparams,
                 &this->nbor->dev_nbor, &this->_nbor_data->begin(),
  this->k_short_nbor.run(&this->atom->x, &this->nbor->dev_nbor,
                         &this->_nbor_data->begin(),
                         &this->dev_short_nbor, &_cutshortsq, &ainum,
                         &nbor_pitch, &this->_threads_per_atom);

+1 −3
Original line number Diff line number Diff line
@@ -165,12 +165,10 @@ _texture( ts5_tex,int4);
#endif

__kernel void k_tersoff_short_nbor(const __global numtyp4 *restrict x_,
                                   const __global int *restrict elem2param,
                                   const int nelements, const int nparams,
                                   const __global int * dev_nbor,
                                   const __global int * dev_packed,
                                   __global int * dev_short_nbor,
                                   const double _cutshortsq,
                                   const numtyp _cutshortsq,
                                   const int inum, const int nbor_pitch,
                                   const int t_per_atom) {
  __local int n_stride;
+4 −4
Original line number Diff line number Diff line
@@ -250,8 +250,8 @@ void TersoffMT::loop(const bool _eflag, const bool _vflag, const int evatom) {
                               (BX/this->_threads_per_atom)));

  this->k_short_nbor.set_size(GX,BX);
  this->k_short_nbor.run(&this->atom->x, &elem2param, &_nelements, &_nparams,
                 &this->nbor->dev_nbor, &this->_nbor_data->begin(),
  this->k_short_nbor.run(&this->atom->x, &this->nbor->dev_nbor,
                         &this->_nbor_data->begin(),
                         &this->dev_short_nbor, &_cutshortsq, &ainum,
                         &nbor_pitch, &this->_threads_per_atom);

+1 −3
Original line number Diff line number Diff line
@@ -165,12 +165,10 @@ _texture( ts5_tex,int4);
#endif

__kernel void k_tersoff_mod_short_nbor(const __global numtyp4 *restrict x_,
                                   const __global int *restrict elem2param,
                                   const int nelements, const int nparams,
                                   const __global int * dev_nbor,
                                   const __global int * dev_packed,
                                   __global int * dev_short_nbor,
                                   const double _cutshortsq,
                                   const numtyp _cutshortsq,
                                   const int inum, const int nbor_pitch,
                                   const int t_per_atom) {
  __local int n_stride;
+4 −4
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ void TersoffZT::loop(const bool _eflag, const bool _vflag, const int evatom) {
                               (BX/this->_threads_per_atom)));

  this->k_short_nbor.set_size(GX,BX);
  this->k_short_nbor.run(&this->atom->x, &elem2param, &_nelements, &_nparams,
                 &this->nbor->dev_nbor, &this->_nbor_data->begin(),
  this->k_short_nbor.run(&this->atom->x, &this->nbor->dev_nbor,
                         &this->_nbor_data->begin(),
                         &this->dev_short_nbor, &_cutshortsq, &ainum,
                         &nbor_pitch, &this->_threads_per_atom);

Loading