ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support vector variable definitions with embedded blanks

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-05-05 01:06:55 -04:00
parent 1b7f9439ad
commit 0facd4cf66
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/variable.cpp
View File

@ -4784,7 +4784,7 @@ void Variable::parse_vector(int ivar, char *str)
memory->create(vecs[ivar].values,vecs[ivar].nmax,"variable:values"); memory->create(vecs[ivar].values,vecs[ivar].nmax,"variable:values");
for (int i = 0; i < nvec; i++) for (int i = 0; i < nvec; i++)
vecs[ivar].values[i] = utils::numeric(FLERR, args[i], false, lmp); vecs[ivar].values[i] = utils::numeric(FLERR, utils::trim(args[i]), false, lmp);
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------

2
unittest/commands/test_variables.cpp
View File

@ -325,7 +325,7 @@ TEST_F(VariableTest, Expressions)
command("variable err1 equal v_one/v_ten7"); command("variable err1 equal v_one/v_ten7");
command("variable err2 equal v_one%v_ten7"); command("variable err2 equal v_one%v_ten7");
command("variable err3 equal v_ten7^-v_one"); command("variable err3 equal v_ten7^-v_one");
command("variable vec1 vector [-2,0,1,2,3,5,7]"); command("variable vec1 vector \"[-2, 0, 1,2 ,3, 5 , 7\n]\"");
command("variable vec2 vector v_vec1*0.5"); command("variable vec2 vector v_vec1*0.5");
command("variable vec3 equal v_vec2[3]"); command("variable vec3 equal v_vec2[3]");
variable->set("dummy index 1 2"); variable->set("dummy index 1 2");