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@8434 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2012-06-29 18:01:14 +00:00
parent fee52f2fac
commit 945fc5a36a
11 changed files with 415 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/neighbor.cpp
View File

@ -945,8 +945,7 @@ void Neighbor::choose_build(int index, NeighRequest *rq)
else if (includegroup)
error->all(FLERR,"Neighbor include group not allowed "
"with ghost neighbors");
// NOTE: missing OMP version of this one
else pb = &Neighbor::half_nsq_no_newton_ghost;
else pb = &Neighbor::half_nsq_no_newton_ghost_omp;
} else if (newton_pair == 1) pb = &Neighbor::half_nsq_newton_omp;
} else if (rq->newton == 1) {
pb = &Neighbor::half_nsq_newton_omp;
@ -955,8 +954,7 @@ void Neighbor::choose_build(int index, NeighRequest *rq)
else if (includegroup)
error->all(FLERR,"Neighbor include group not allowed "
"with ghost neighbors");
// NOTE: missing OMP version of this one
else pb = &Neighbor::half_nsq_no_newton_ghost;
else pb = &Neighbor::half_nsq_no_newton_ghost_omp;
}
} else if (style == BIN) {
if (rq->newton == 0) {
@ -965,8 +963,7 @@ void Neighbor::choose_build(int index, NeighRequest *rq)
else if (includegroup)
error->all(FLERR,"Neighbor include group not allowed "
"with ghost neighbors");
// NOTE: missing OMP version of this one
else pb = &Neighbor::half_bin_no_newton_ghost;
else pb = &Neighbor::half_bin_no_newton_ghost_omp;
} else if (triclinic == 0) {
pb = &Neighbor::half_bin_newton_omp;
} else if (triclinic == 1)
@ -979,8 +976,7 @@ void Neighbor::choose_build(int index, NeighRequest *rq)
else if (includegroup)
error->all(FLERR,"Neighbor include group not allowed "
"with ghost neighbors");
// NOTE: missing OMP version of this one
else pb = &Neighbor::half_bin_no_newton_ghost;
else pb = &Neighbor::half_bin_no_newton_ghost_omp;
}
} else if (style == MULTI) {
if (rq->ghost == 1)