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

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14715 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2016-03-01 22:56:00 +00:00
parent 9e22165357
commit ef273d3095
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/variable.cpp
View File

@ -3034,8 +3034,10 @@ int Variable::size_tree_vector(Tree *tree)
{
int nsize = 0;
if (tree->type == VECTORARRAY) nsize = tree->nvector;
if (tree->first) nsize = compare_tree_vector(nsize,size_tree_vector(tree->first));
if (tree->second) nsize = compare_tree_vector(nsize,size_tree_vector(tree->second));
if (tree->first) nsize = compare_tree_vector(nsize,
size_tree_vector(tree->first));
if (tree->second) nsize = compare_tree_vector(nsize,
size_tree_vector(tree->second));
if (tree->nextra) {
for (int i = 0; i < tree->nextra; i++)
nsize = compare_tree_vector(nsize,size_tree_vector(tree->extra[i]));
@ -3945,10 +3947,13 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
if (index)
error->all(FLERR,"Invalid special function in variable formula");
ivar = find(&args[0][2]);
if (ivar < 0) error->all(FLERR,"Invalid special function in variable formula");
if (ivar < 0)
error->all(FLERR,"Invalid special function in variable formula");
if (style[ivar] != VECTOR)
error->all(FLERR,"Mis-matched special function variable in variable formula");
if (eval_in_progress[ivar]) error->all(FLERR,"Variable has circular dependency");
error->all(FLERR,
"Mis-matched special function variable in variable formula");
if (eval_in_progress[ivar])
error->all(FLERR,"Variable has circular dependency");
double *vec;
nvec = compute_vector(ivar,&vec);