Follow requested changes to patch
This commit is contained in:
@ -1660,14 +1660,16 @@ double Variable::evaluate(char *str, Tree **tree, int ivar)
|
|||||||
if (!compute->is_initialized())
|
if (!compute->is_initialized())
|
||||||
print_var_error(FLERR,"Variable formula compute cannot be invoked before "
|
print_var_error(FLERR,"Variable formula compute cannot be invoked before "
|
||||||
"initialization by a run",ivar);
|
"initialization by a run",ivar);
|
||||||
|
if (index1 > compute->size_array_cols)
|
||||||
|
print_var_error(FLERR,"Variable formula compute array is accessed out-of-range",ivar,0);
|
||||||
if (!(compute->invoked_flag & Compute::INVOKED_ARRAY)) {
|
if (!(compute->invoked_flag & Compute::INVOKED_ARRAY)) {
|
||||||
compute->compute_array();
|
compute->compute_array();
|
||||||
compute->invoked_flag |= Compute::INVOKED_ARRAY;
|
compute->invoked_flag |= Compute::INVOKED_ARRAY;
|
||||||
}
|
}
|
||||||
|
// wait until after compute invocation to check size_array_rows
|
||||||
|
// b/c may be zero until after initial invocation
|
||||||
if (compute->size_array_rows == 0)
|
if (compute->size_array_rows == 0)
|
||||||
print_var_error(FLERR,"Variable formula compute array is zero length",ivar);
|
print_var_error(FLERR,"Variable formula compute array is zero length",ivar);
|
||||||
if (index1 > compute->size_array_cols)
|
|
||||||
print_var_error(FLERR,"Variable formula compute array is accessed out-of-range",ivar,0);
|
|
||||||
|
|
||||||
auto newtree = new Tree();
|
auto newtree = new Tree();
|
||||||
newtree->type = VECTORARRAY;
|
newtree->type = VECTORARRAY;
|
||||||
|
|||||||
Reference in New Issue
Block a user