tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for inline format strings to immediate variable substitution

Browse Source
This commit is contained in:
Sebastian Hütter
2018-06-14 14:17:37 +02:00
parent 29e555213c
commit c5b51df06e
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doc/src/Section_commands.txt
View File

@ -129,6 +129,15 @@ region 1 block $((xlo+xhi)/2+sqrt(v_area)) 2 INF INF EDGE EDGE :pre
so that you do not have to define (or discard) a temporary variable X. so that you do not have to define (or discard) a temporary variable X.
Additionally, the "immediate" expression may be followed by a colon,
followed by a C-style format string, e.g. "%f" or "%.10g", which must be
appropriate for formatting a double-precision floating-point value. The
format string will be used to output the result of the variable evaluation,
so you do not have to define a temporary "format-style variable"_variable.html.
This may be used for formatting print output:
print "Final energy per atom: $(pe/atoms:%10.3f) eV/atom" :pre
Note that neither the curly-bracket or immediate form of variables can Note that neither the curly-bracket or immediate form of variables can
contain nested $ characters for other variables to substitute for. contain nested $ characters for other variables to substitute for.
Thus you cannot do this: Thus you cannot do this:

9
src/input.cpp
View File

@ -516,7 +516,14 @@ void Input::substitute(char *&str, char *&str2, int &max, int &max2, int flag)
if (var[i] == '\0') error->one(FLERR,"Invalid immediate variable"); if (var[i] == '\0') error->one(FLERR,"Invalid immediate variable");
var[i] = '\0'; var[i] = '\0';
beyond = ptr + strlen(var) + 3; beyond = ptr + strlen(var) + 3;
sprintf(immediate,"%.20g",variable->compute_equal(var)); // check if an inline format specifier was given
char fmtstr[64] = "%.20g";
char *fmtflag;
if ((fmtflag=strrchr(var, ':')) && (fmtflag[1]=='%')) {
strncpy(fmtstr,&fmtflag[1],sizeof(fmtstr)-1);
*fmtflag='\0';
}
sprintf(immediate,fmtstr,variable->compute_equal(var));
value = immediate; value = immediate;
// single character variable name, e.g. $a // single character variable name, e.g. $a