whitespace
This commit is contained in:
@ -1782,7 +1782,7 @@ void Input::pair_coeff()
|
|||||||
if ((narg < 2) || (force->pair->one_coeff && ((strcmp(arg[0],"*") != 0)
|
if ((narg < 2) || (force->pair->one_coeff && ((strcmp(arg[0],"*") != 0)
|
||||||
|| (strcmp(arg[1],"*") != 0))))
|
|| (strcmp(arg[1],"*") != 0))))
|
||||||
error->all(FLERR,"Incorrect args for pair coefficients");
|
error->all(FLERR,"Incorrect args for pair coefficients");
|
||||||
|
|
||||||
int newflag0 = readtype(arg[0],Atom::ATOM);
|
int newflag0 = readtype(arg[0],Atom::ATOM);
|
||||||
int newflag1 = readtype(arg[1],Atom::ATOM);
|
int newflag1 = readtype(arg[1],Atom::ATOM);
|
||||||
|
|
||||||
|
|||||||
@ -2043,7 +2043,7 @@ void ReadData::impropercoeffs(int which)
|
|||||||
|
|
||||||
void ReadData::typelabels(std::vector<std::string> &mytypelabel, int myntypes, int mode)
|
void ReadData::typelabels(std::vector<std::string> &mytypelabel, int myntypes, int mode)
|
||||||
{
|
{
|
||||||
if (settypeflag)
|
if (settypeflag)
|
||||||
error->all(FLERR,"Must read Type Labels before any section involving types");
|
error->all(FLERR,"Must read Type Labels before any section involving types");
|
||||||
char *next;
|
char *next;
|
||||||
char *buf = new char[myntypes*MAXLINE];
|
char *buf = new char[myntypes*MAXLINE];
|
||||||
@ -2060,7 +2060,7 @@ void ReadData::typelabels(std::vector<std::string> &mytypelabel, int myntypes, i
|
|||||||
*next = '\0';
|
*next = '\0';
|
||||||
int rv = sscanf(buf,"%*d %s",typelabel);
|
int rv = sscanf(buf,"%*d %s",typelabel);
|
||||||
if (rv != 1) error->all(FLERR,"Invalid data file section: Type Labels");
|
if (rv != 1) error->all(FLERR,"Invalid data file section: Type Labels");
|
||||||
if (isdigit(typelabel[0]))
|
if (isdigit(typelabel[0]))
|
||||||
error->all(FLERR,"Type labels cannot start with a number");
|
error->all(FLERR,"Type labels cannot start with a number");
|
||||||
mytypelabel[i] = typelabel;
|
mytypelabel[i] = typelabel;
|
||||||
buf = next + 1;
|
buf = next + 1;
|
||||||
|
|||||||
Reference in New Issue
Block a user