jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

also allow %e in format variables of suffix

This commit is contained in:
Axel Kohlmeyer 2019-05-30 14:52:26 -04:00
parent 1a5c3c6dcb
commit 02e7dd5716
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/Errors_messages.txt
View File

@ -5830,9 +5830,9 @@ Must have periodic x,y dimensions and non-periodic z dimension to use
{Incorrect conversion in format string} :dt
A format style variable was not using either a %f or a %g conversion.
A format style variable was not using either a %f, a %g, or a %e conversion.
Or an immediate variable with format suffix was not using either
a %f or a %g conversion in the format suffix. :dd
a %f, a %g or a %e conversion in the format suffix. :dd
{Incorrect element names in ADP potential file} :dt

2
src/input.cpp
View File

@ -529,7 +529,7 @@ void Input::substitute(char *&str, char *&str2, int &max, int &max2, int flag)
// quick check for proper format string
if (!utils::strmatch(fmtstr,"%[0-9 ]*\\.[0-9]+[fg]"))
if (!utils::strmatch(fmtstr,"%[0-9 ]*\\.[0-9]+[efgEFG]"))
error->all(FLERR,"Incorrect conversion in format string");
snprintf(immediate,256,fmtstr,variable->compute_equal(var));

2
src/input.h
View File

@ -176,7 +176,7 @@ quote.
E: Incorrect conversion in format string
An immediate variable with format suffix was not using
either a %f or a %g conversion in the format suffix.
either a %f, a %g, or a %e conversion in the format suffix.
E: Input line quote not followed by white-space

2
src/variable.cpp
View File

@ -384,7 +384,7 @@ void Variable::set(int narg, char **arg)
num[nvar] = 3;
which[nvar] = 0;
pad[nvar] = 0;
if (!utils::strmatch(arg[2],"%[0-9 ]*\\.[0-9]+[fg]"))
if (!utils::strmatch(arg[2],"%[0-9 ]*\\.[0-9]+[efgEFG]"))
error->all(FLERR,"Incorrect conversion in format string");
data[nvar] = new char*[num[nvar]];
copy(2,&arg[2],data[nvar]);

2
src/variable.h
View File

@ -212,7 +212,7 @@ command.
E: Incorrect conversion in format string
A format style variable was not using either a %f or a %g conversion.
A format style variable was not using either a %f, a %g, or a %e conversion.
E: Next command must list all universe and uloop variables