Unverified Commit 02e7dd57 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

also allow %e in format variables of suffix

parent 1a5c3c6d

doc/src/Errors_messages.txt

+2 −2
Original line number Diff line number Diff line
@@ -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

src/input.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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));

src/input.h

+1 −1
Original line number Diff line number Diff line
@@ -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

src/variable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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]);

src/variable.h

+1 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE