moebiusband/MD-Bench
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When building neighbor lists, skip first iterations until z is in range

Browse Source 
Signed-off-by: Rafael Ravedutti <rafaelravedutti@gmail.com>
This commit is contained in:
Rafael Ravedutti 2022-02-07 18:28:53 +01:00
parent 0eacb2453e
commit cd15911a97
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gromacs/neighbor.c
View File

@ -245,36 +245,44 @@ void buildNeighbor(Atom *atom, Neighbor *neighbor) {
const int c = cluster_bincount[jbin]; const int c = cluster_bincount[jbin];
if(c > 0) { if(c > 0) {
//do { MD_FLOAT dl, dh, dm, dm0, d_bb_sq;
do {
m++; m++;
cj = loc_bin[m]; cj = loc_bin[m];
jbb_zmin = atom->clusters[cj].bbminz;
jbb_zmax = atom->clusters[cj].bbmaxz;
dl = ibb_zmin - jbb_zmax;
dh = jbb_zmin - ibb_zmax;
dm = MAX(dl, dh);
dm0 = MAX(dm, 0.0);
d_bb_sq = dm0 * dm0;
} while(m + 1 < c && d_bb_sq > cutneighsq);
jbb_xmin = atom->clusters[cj].bbminx; jbb_xmin = atom->clusters[cj].bbminx;
jbb_xmax = atom->clusters[cj].bbmaxx; jbb_xmax = atom->clusters[cj].bbmaxx;
jbb_ymin = atom->clusters[cj].bbminy; jbb_ymin = atom->clusters[cj].bbminy;
jbb_ymax = atom->clusters[cj].bbmaxy; jbb_ymax = atom->clusters[cj].bbmaxy;
jbb_zmin = atom->clusters[cj].bbminz;
jbb_zmax = atom->clusters[cj].bbmaxz;
//} while(m + 1 < c && (ibb_zmin - jbb_zmax) * (ibb_zmin - jbb_zmax) > cutneighsq);
while(m < c) { while(m < c) {
/*if((jbb_zmin - ibb_zmax) * (jbb_zmin - ibb_zmax) > cutneighsq) { dl = ibb_zmin - jbb_zmax;
dh = jbb_zmin - ibb_zmax;
dm = MAX(dl, dh);
dm0 = MAX(dm, 0.0);
d_bb_sq = dm0 * dm0;
/*if(d_bb_sq > cutneighsq) {
break; break;
}*/ }*/
MD_FLOAT dl = ibb_xmin - jbb_xmax;
MD_FLOAT dh = jbb_xmin - ibb_xmax;
MD_FLOAT dm = MAX(dl, dh);
MD_FLOAT dm0 = MAX(dm, 0.0);
MD_FLOAT d_bb_sq = dm0 * dm0;
dl = ibb_ymin - jbb_ymax; dl = ibb_ymin - jbb_ymax;
dh = jbb_ymin - ibb_ymax; dh = jbb_ymin - ibb_ymax;
dm = MAX(dl, dh); dm = MAX(dl, dh);
dm0 = MAX(dm, 0.0); dm0 = MAX(dm, 0.0);
d_bb_sq += dm0 * dm0; d_bb_sq += dm0 * dm0;
dl = ibb_zmin - jbb_zmax; dl = ibb_xmin - jbb_xmax;
dh = jbb_zmin - ibb_zmax; dh = jbb_xmin - ibb_xmax;
dm = MAX(dl, dh); dm = MAX(dl, dh);
dm0 = MAX(dm, 0.0); dm0 = MAX(dm, 0.0);
d_bb_sq += dm0 * dm0; d_bb_sq += dm0 * dm0;