Merge branch 'lammps:develop' into create_atoms-overlap_w_mol

This commit is contained in:
Jacob Gissinger
2024-02-13 18:47:15 -05:00
committed by GitHub
932 changed files with 16455 additions and 10415 deletions

View File

@ -179,7 +179,8 @@ void CreateAtoms::command(int narg, char **arg)
if (imol == -1)
error->all(FLERR, "Molecule template ID {} for create_atoms does not exist", arg[iarg + 1]);
if ((atom->molecules[imol]->nset > 1) && (comm->me == 0))
error->warning(FLERR, "Molecule template for create_atoms has multiple molecules");
error->warning(FLERR, "Molecule template for create_atoms has multiple molecule sets. "
"Only the first set will be used.");
mode = MOLECULE;
onemol = atom->molecules[imol];
molseed = utils::inumeric(FLERR, arg[iarg + 2], false, lmp);
@ -505,7 +506,7 @@ void CreateAtoms::command(int narg, char **arg)
// molcreate = # of molecules I created
tagint molcreate = (atom->nlocal - nlocal_previous) / onemol->natoms;
tagint molcreate = (atom->nlocal - nlocal_previous) / onemol->natoms * onemol->nmolecules;
// increment total bonds,angles,etc