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

Browse Source
This commit is contained in:
sjplimp
2015-03-27 20:39:27 +00:00
parent bc06bcf854
commit 9435c9dcb1
14 changed files with 566 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/variable.cpp
View File

@ -2308,8 +2308,8 @@ double Variable::collapse_tree(Tree *tree)
else if (update->ntimestep < ivalue2) {
int offset = update->ntimestep - ivalue1;
tree->value = ivalue1 + (offset/ivalue3)*ivalue3 + ivalue3;
if (tree->value > ivalue2) tree->value = 9.0e18;
} else tree->value = 9.0e18;
if (tree->value > ivalue2) tree->value = MAXBIGINT;
} else tree->value = MAXBIGINT;
return tree->value;
}
@ -2345,10 +2345,10 @@ double Variable::collapse_tree(Tree *tree)
if (istep > ivalue5) {
int offset = ivalue5 - ivalue1;
istep = ivalue1 + (offset/ivalue3)*ivalue3 + ivalue3;
if (istep > ivalue2) istep = 9.0e18;
if (istep > ivalue2) istep = MAXBIGINT;
}
}
} else istep = 9.0e18;
} else istep = MAXBIGINT;
tree->value = istep;
return tree->value;
}
@ -2633,8 +2633,8 @@ double Variable::eval_tree(Tree *tree, int i)
else if (update->ntimestep < ivalue2) {
int offset = update->ntimestep - ivalue1;
arg = ivalue1 + (offset/ivalue3)*ivalue3 + ivalue3;
if (arg > ivalue2) arg = 9.0e18;
} else arg = 9.0e18;
if (arg > ivalue2) arg = MAXBIGINT;
} else arg = MAXBIGINT;
return arg;
}
@ -2665,10 +2665,10 @@ double Variable::eval_tree(Tree *tree, int i)
if (istep > ivalue5) {
int offset = ivalue5 - ivalue1;
istep = ivalue1 + (offset/ivalue3)*ivalue3 + ivalue3;
if (istep > ivalue2) istep = 9.0e18;
if (istep > ivalue2) istep = MAXBIGINT;
}
}
} else istep = 9.0e18;
} else istep = MAXBIGINT;
arg = istep;
return arg;
}
@ -3141,8 +3141,8 @@ int Variable::math_function(char *word, char *contents, Tree **tree,
else if (update->ntimestep < ivalue2) {
int offset = update->ntimestep - ivalue1;
value = ivalue1 + (offset/ivalue3)*ivalue3 + ivalue3;
if (value > ivalue2) value = 9.0e18;
} else value = 9.0e18;
if (value > ivalue2) value = MAXBIGINT;
} else value = MAXBIGINT;
argstack[nargstack++] = value;
}
@ -3176,10 +3176,10 @@ int Variable::math_function(char *word, char *contents, Tree **tree,
if (istep > ivalue5) {
int offset = ivalue5 - ivalue1;
istep = ivalue1 + (offset/ivalue3)*ivalue3 + ivalue3;
if (istep > ivalue2) istep = 9.0e18;
if (istep > ivalue2) istep = MAXBIGINT;
}
}
} else istep = 9.0e18;
} else istep = MAXBIGINT;
double value = istep;
argstack[nargstack++] = value;
}