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

make implicit boolean conversions explicit

Browse Source
This commit is contained in:
Axel Kohlmeyer
2025-06-24 05:47:05 -04:00
parent 264750e47c
commit df04fc943d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/variable.cpp
View File

@ -2976,7 +2976,7 @@ double Variable::collapse_tree(Tree *tree)
arg3 = collapse_tree(tree->extra[0]); arg3 = collapse_tree(tree->extra[0]);
if (tree->first->type != VALUE) return 0.0; if (tree->first->type != VALUE) return 0.0;
tree->type = VALUE; tree->type = VALUE;
if (arg1) tree->value = arg2; if (arg1 != 0.0) tree->value = arg2;
else tree->value = arg3; else tree->value = arg3;
return tree->value; return tree->value;
} }
@ -3400,7 +3400,7 @@ double Variable::eval_tree(Tree *tree, int i)
double first = eval_tree(tree->first,i); double first = eval_tree(tree->first,i);
double second = eval_tree(tree->second,i); double second = eval_tree(tree->second,i);
double third = eval_tree(tree->extra[0],i); double third = eval_tree(tree->extra[0],i);
if (first) return second; if (first != 0.0) return second;
else return third; else return third;
} }
@ -3940,7 +3940,7 @@ int Variable::math_function(char *word, char *contents, Tree **tree, Tree **tree
print_var_error(FLERR,"Invalid math function in variable formula",ivar); print_var_error(FLERR,"Invalid math function in variable formula",ivar);
if (tree) newtree->type = TERNARY; if (tree) newtree->type = TERNARY;
else { else {
if (value1) argstack[nargstack++] = value2; if (value1 != 0.0) argstack[nargstack++] = value2;
else argstack[nargstack++] = values[0]; else argstack[nargstack++] = values[0];
} }