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

Fixing merge conflicts

Browse Source
This commit is contained in:
Joel Clemmer
2020-10-02 15:09:47 -06:00
parent 51d55aa036
commit b1b014aed3
27 changed files with 2413 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/comm_brick.cpp
View File

@ -181,6 +181,12 @@ void CommBrick::setup()
cutghostmulti[i][0] = MAX(cut,cuttype[i]);
cutghostmulti[i][1] = MAX(cut,cuttype[i]);
cutghostmulti[i][2] = MAX(cut,cuttype[i]);
if (multi_bytype == 1) {
// Set the BYTYPE cutoff
cutghostmulti[i][0] = sqrt(neighbor->cutneighsq[i][i]);
cutghostmulti[i][1] = sqrt(neighbor->cutneighsq[i][i]);
cutghostmulti[i][2] = sqrt(neighbor->cutneighsq[i][i]);
}
}
}