Merge branch 'master' into prepare-clang-format

# Conflicts:
#	src/MOLECULE/bond_fene.h
#	src/MOLECULE/bond_fene_expand.h
This commit is contained in:
Axel Kohlmeyer
2021-05-11 21:49:48 -04:00
205 changed files with 16072 additions and 8024 deletions

View File

@ -390,9 +390,8 @@ void ChangeBox::command(int narg, char **arg)
bigint nblocal = atom->nlocal;
MPI_Allreduce(&nblocal,&natoms,1,MPI_LMP_BIGINT,MPI_SUM,world);
if (natoms != atom->natoms && comm->me == 0)
error->warning(FLERR,fmt::format("Lost atoms via change_box: "
"original {} current {}",
atom->natoms,natoms));
error->warning(FLERR,"Lost atoms via change_box: original {} "
"current {}", atom->natoms,natoms);
}
/* ----------------------------------------------------------------------