merged in current master

This commit is contained in:
Steve Plimpton
2022-11-04 08:22:18 -06:00
3789 changed files with 21727 additions and 7888 deletions

View File

@ -2,7 +2,7 @@
/* ----------------------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
https://www.lammps.org/, Sandia National Laboratories
Steve Plimpton, sjplimp@sandia.gov
LAMMPS development team: developers@lammps.org
Copyright (2003) Sandia Corporation. Under the terms of Contract
DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
@ -95,7 +95,7 @@ FixBalance::FixBalance(LAMMPS *lmp, int narg, char **arg) :
}
}
if (lbstyle == BISECTION && comm->style == 0)
if (lbstyle == BISECTION && comm->style == Comm::BRICK)
error->all(FLERR,"Fix balance rcb cannot be used with comm_style brick");
// create instance of Balance class