Merge branch 'develop' into consolidate-sphere-omega-flag

# Conflicts:
#	src/compute_temp_sphere.cpp
This commit is contained in:
Axel Kohlmeyer
2024-01-25 17:57:53 -05:00
532 changed files with 1949 additions and 1906 deletions

View File

@ -59,13 +59,10 @@ AtomVecSphere::AtomVecSphere(LAMMPS *lmp) : AtomVec(lmp)
void AtomVecSphere::process_args(int narg, char **arg)
{
if (narg != 0 && narg != 1) error->all(FLERR, "Illegal atom_style sphere command");
if (narg > 1) error->all(FLERR, "Illegal atom_style sphere command");
radvary = 0;
if (narg == 1) {
radvary = utils::numeric(FLERR, arg[0], true, lmp);
if (radvary < 0 || radvary > 1) error->all(FLERR, "Illegal atom_style sphere command");
}
if (narg == 1) radvary = utils::logical(FLERR, arg[0], true, lmp);
// dynamic particle radius and mass must be communicated every step