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@6486 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2011-06-30 20:10:18 +00:00
parent 40ac5cd2fb
commit aedbb28b6c
86 changed files with 97 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/variable.cpp
View File

@ -666,7 +666,7 @@ double Variable::evaluate(char *str, Tree **tree)
if (tree) {
Tree *newtree;
double tmp = evaluate(contents,&newtree);
evaluate(contents,&newtree);
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = evaluate(contents,NULL);
@ -1135,7 +1135,7 @@ double Variable::evaluate(char *str, Tree **tree)
if (tree == NULL)
error->all("Atom-style variable in equal-style variable formula");
Tree *newtree;
double tmp = evaluate(data[ivar][0],&newtree);
evaluate(data[ivar][0],&newtree);
treestack[ntreestack++] = newtree;
// v_name[N] = scalar from atom-style per-atom vector
@ -1408,7 +1408,7 @@ double Variable::evaluate(char *str, Tree **tree)
double Variable::collapse_tree(Tree *tree)
{
double arg1,arg2,arg3;
double arg1,arg2;
if (tree->type == VALUE) return tree->value;
if (tree->type == ATOMARRAY) return 0.0;
@ -1660,8 +1660,8 @@ double Variable::collapse_tree(Tree *tree)
// random() or normal() do not become a single collapsed value
if (tree->type == RANDOM) {
double lower = collapse_tree(tree->left);
double upper = collapse_tree(tree->middle);
collapse_tree(tree->left);
collapse_tree(tree->middle);
if (randomatom == NULL) {
int seed = static_cast<int> (collapse_tree(tree->right));
if (seed <= 0) error->one("Invalid math function in variable formula");
@ -1671,7 +1671,7 @@ double Variable::collapse_tree(Tree *tree)
}
if (tree->type == NORMAL) {
double mu = collapse_tree(tree->left);
collapse_tree(tree->left);
double sigma = collapse_tree(tree->middle);
if (sigma < 0.0) error->one("Invalid math function in variable formula");
if (randomatom == NULL) {
@ -3142,7 +3142,6 @@ double Variable::evaluate_boolean(char *str)
int op,opprevious;
double value1,value2;
char onechar;
char *ptr;
double argstack[MAXLEVEL];
int opstack[MAXLEVEL];