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

Replacing binsizex with multi2 version

Browse Source
This commit is contained in:
Joel Clemmer
2020-11-30 20:55:04 -07:00
parent e716abd34a
commit 6308248a44
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/comm.cpp
View File

@ -248,6 +248,7 @@ void Comm::init()
// Could remove NP_NEWTON from npair_full_*multi2*, but could be cryptic
// Also could be cases where you want newton off (hybrid) but don't use multi2 comm
// Could add check on neighbor build, if full and comm->multi2 error...
// or just add check on comm setup - is that run before every run? Only if box change...
if (force->newton == 0 && multi2)
error->all(FLERR,"Cannot use multi2 communication with Newton off");
}

6
src/nstencil.cpp
View File

@ -345,11 +345,11 @@ void NStencil::create_setup()
stencil_range = sqrt(cutneighsq[i][j]);
sx = static_cast<int> (stencil_range*bininvx_multi2[bin_type]);
if (sx*binsizex < stencil_range) sx++;
if (sx*binsizex_multi2[bin_type] < stencil_range) sx++;
sy = static_cast<int> (stencil_range*bininvy_multi2[bin_type]);
if (sy*binsizey < stencil_range) sy++;
if (sy*binsizey_multi2[bin_type] < stencil_range) sy++;
sz = static_cast<int> (stencil_range*bininvz_multi2[bin_type]);
if (sz*binsizez < stencil_range) sz++;
if (sz*binsizez_multi2[bin_type] < stencil_range) sz++;
stencil_sx_multi2[i][j] = sx;
stencil_sy_multi2[i][j] = sy;

2
src/nstencil_half_multi2_2d.cpp
View File

@ -88,7 +88,7 @@ void NStencilHalfMulti22d::create()
if (j > 0 || (j == 0 && i > 0)) {
if (bin_distance_multi2(i,j,0,bin_type) < cutsq)
stencil_multi2[itype][jtype][ns++] = j*mbinx + i;
}
}
} else {
for (j = -sy; j <= sy; j++)
for (i = -sx; i <= sx; i++)

2
src/nstencil_half_multi2_3d.cpp
View File

@ -92,7 +92,7 @@ void NStencilHalfMulti23d::create()
if (bin_distance_multi2(i,j,k,bin_type) < cutsq)
stencil_multi2[itype][jtype][ns++] =
k*mbiny*mbinx + j*mbinx + i;
}
}
} else {
for (k = -sz; k <= sz; k++)
for (j = -sy; j <= sy; j++)