Merge branch 'fix-property-array' of github.com:lammps/lammps into fix-property-array

This commit is contained in:
Steve Plimpton
2021-08-19 09:00:51 -06:00
4 changed files with 45 additions and 48 deletions

View File

@ -1532,15 +1532,12 @@ int DumpCustom::parse_fields(int narg, char **arg)
error->all(FLERR,"Could not find custom per-atom property ID: {}", name);
if (argindex[iarg] == 0) {
if (!flag || cols)
error->all(FLERR,
"Property double vector for dump custom does not exist");
error->all(FLERR,"Property double vector for dump custom does not exist");
} else {
if (!flag || !cols)
error->all(FLERR,
"Property double array for dump custom does not exist");
error->all(FLERR,"Property double array for dump custom does not exist");
if (argindex[iarg] > atom->dcols[n])
error->all(FLERR,
"Dump custom property array is accessed out-of-range");
error->all(FLERR,"Dump custom property array is accessed out-of-range");
}
field2index[iarg] = add_custom(name,1);