correctly check for index and dimensionality
This commit is contained in:
@ -150,11 +150,11 @@ ComputeChunkAtom::ComputeChunkAtom(LAMMPS *lmp, int narg, char **arg) :
|
||||
ArgInfo argi(arg[3]);
|
||||
|
||||
which = argi.get_type();
|
||||
argindex = argi.get_dim();
|
||||
argindex = argi.get_index1();
|
||||
cfvid = argi.copy_name();
|
||||
|
||||
if ((which == ArgInfo::UNKNOWN) || (which == ArgInfo::NONE)
|
||||
|| (argindex > 1))
|
||||
|| (argi.get_dim() > 1))
|
||||
error->all(FLERR,"Illegal compute chunk/atom command");
|
||||
}
|
||||
|
||||
|
||||
@ -69,11 +69,11 @@ ComputeChunkSpreadAtom(LAMMPS *lmp, int narg, char **arg) :
|
||||
ArgInfo argi(arg[iarg], ArgInfo::COMPUTE|ArgInfo::FIX);
|
||||
|
||||
which[nvalues] = argi.get_type();
|
||||
argindex[nvalues] = argi.get_dim();
|
||||
argindex[nvalues] = argi.get_index1();
|
||||
ids[nvalues] = argi.copy_name();
|
||||
|
||||
if ((which[nvalues] == ArgInfo::UNKNOWN) || (which[nvalues] == ArgInfo::NONE)
|
||||
|| (argindex[nvalues] > 1))
|
||||
|| (argi.get_dim() > 1))
|
||||
error->all(FLERR,"Illegal compute chunk/spread/atom command");
|
||||
|
||||
nvalues++;
|
||||
|
||||
@ -85,11 +85,11 @@ ComputeReduceChunk::ComputeReduceChunk(LAMMPS *lmp, int narg, char **arg) :
|
||||
ArgInfo argi(arg[iarg]);
|
||||
|
||||
which[nvalues] = argi.get_type();
|
||||
argindex[nvalues] = argi.get_dim();
|
||||
argindex[nvalues] = argi.get_index1();
|
||||
ids[nvalues] = argi.copy_name();
|
||||
|
||||
if ((which[nvalues] == ArgInfo::UNKNOWN) || (which[nvalues] == ArgInfo::NONE)
|
||||
|| (argindex[nvalues] > 1))
|
||||
|| (argi.get_dim() > 1))
|
||||
error->all(FLERR,"Illegal compute reduce/chunk command");
|
||||
|
||||
nvalues++;
|
||||
|
||||
@ -56,12 +56,14 @@ ComputeSlice::ComputeSlice(LAMMPS *lmp, int narg, char **arg) :
|
||||
ArgInfo argi(arg[iarg]);
|
||||
|
||||
which[nvalues] = argi.get_type();
|
||||
argindex[nvalues] = argi.get_dim();
|
||||
argindex[nvalues] = argi.get_index1();
|
||||
ids[nvalues] = argi.copy_name();
|
||||
|
||||
if ((which[nvalues] == ArgInfo::UNKNOWN) || (which[nvalues] == ArgInfo::NONE)
|
||||
|| (argindex[nvalues] > 1))
|
||||
|| (argi.get_dim() > 1))
|
||||
error->all(FLERR,"Illegal compute slice command");
|
||||
|
||||
nvalues++;
|
||||
}
|
||||
|
||||
// setup and error check
|
||||
|
||||
@ -99,11 +99,11 @@ FixAveAtom::FixAveAtom(LAMMPS *lmp, int narg, char **arg) :
|
||||
ArgInfo argi(arg[i]);
|
||||
|
||||
which[i] = argi.get_type();
|
||||
argindex[i] = argi.get_dim();
|
||||
argindex[i] = argi.get_index1();
|
||||
ids[i] = argi.copy_name();
|
||||
|
||||
if ((which[i] == ArgInfo::UNKNOWN) || (which[i] == ArgInfo::NONE)
|
||||
|| (argindex[i] > 1))
|
||||
|| (argi.get_dim() > 1))
|
||||
error->all(FLERR,"Illegal fix ave/atom command");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user