Fix merge conflicts, minor style fixes

This commit is contained in:
Joel Thomas Clemmer
2021-11-01 18:13:06 -06:00
1240 changed files with 46027 additions and 14730 deletions

View File

@ -33,7 +33,6 @@
#include <cmath>
#include <cstring>
#include <vector>
using namespace LAMMPS_NS;
@ -1979,7 +1978,7 @@ void CommTiled::box_drop_brick(int idim, double *lo, double *hi, int &indexme)
if (index < 0 || index > procgrid[idim])
error->one(FLERR,"Comm tiled invalid index in box drop brick");
while (1) {
while (true) {
lower = boxlo[idim] + prd[idim]*split[index];
if (index < procgrid[idim]-1)
upper = boxlo[idim] + prd[idim]*split[index+1];