ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sjplimp
2015-03-04 21:46:19 +00:00
parent 1403acd501
commit 925991ea85
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/accelerator_intel.h
View File

@ -34,7 +34,7 @@
template <class flt_t, class acc_t> template <class flt_t, class acc_t>
void bin_atoms(void *, int *); void bin_atoms(void *, int *);
template <class flt_t, class acc_t, int> template <class flt_t, class acc_t, int>
void hbni(const int, NeighList *, void *, const int, const int, void *, void hbni(const int, NeighList *, void *, const int, const int, void *,
const int offload_end = 0); const int offload_end = 0);
template <class flt_t, class acc_t> template <class flt_t, class acc_t>
@ -42,10 +42,14 @@ template <class flt_t, class acc_t, int>
template <class flt_t, class acc_t, int> template <class flt_t, class acc_t, int>
void hbnti(const int, NeighList *, void *, const int, const int, void *, void hbnti(const int, NeighList *, void *, const int, const int, void *,
const int offload_end = 0); const int offload_end = 0);
template <class flt_t, class acc_t, int>
void fbi(const int, NeighList *, void *, const int, const int, void *,
const int offload_end = 0);
void half_bin_no_newton_intel(class NeighList *); void half_bin_no_newton_intel(class NeighList *);
void half_bin_newton_intel(class NeighList *); void half_bin_newton_intel(class NeighList *);
void half_bin_newton_tri_intel(class NeighList *); void half_bin_newton_tri_intel(class NeighList *);
void full_bin_intel(class NeighList *);
#endif /* !LMP_INSIDE_NEIGHBOR_H */ #endif /* !LMP_INSIDE_NEIGHBOR_H */
@ -58,6 +62,7 @@ template <class flt_t, class acc_t, int>
void half_bin_no_newton_intel(class NeighList *) {} void half_bin_no_newton_intel(class NeighList *) {}
void half_bin_newton_intel(class NeighList *) {} void half_bin_newton_intel(class NeighList *) {}
void half_bin_newton_tri_intel(class NeighList *) {} void half_bin_newton_tri_intel(class NeighList *) {}
void full_bin_intel(class NeighList *) {}
#endif #endif

6
src/neighbor.cpp
View File

@ -1187,8 +1187,10 @@ void Neighbor::choose_build(int index, NeighRequest *rq)
"Neighbor include group not allowed with ghost neighbors"); "Neighbor include group not allowed with ghost neighbors");
else pb = &Neighbor::full_nsq_ghost_omp; else pb = &Neighbor::full_nsq_ghost_omp;
} else if (style == BIN) { } else if (style == BIN) {
if (rq->ghost == 0) pb = &Neighbor::full_bin_omp; if (rq->ghost == 0) {
else if (includegroup) if (rq->intel) pb = &Neighbor::full_bin_intel;
else pb = &Neighbor::full_bin_omp;
} else if (includegroup)
error->all(FLERR, error->all(FLERR,
"Neighbor include group not allowed with ghost neighbors"); "Neighbor include group not allowed with ghost neighbors");
else pb = &Neighbor::full_bin_ghost_omp; else pb = &Neighbor::full_bin_ghost_omp;