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

Browse Source
This commit is contained in:
sjplimp
2008-04-01 14:47:15 +00:00
parent cd5306ddbf
commit 181fae42bd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/variable.cpp
View File

@ -35,6 +35,8 @@ using namespace LAMMPS_NS;
#define VARDELTA 4
#define MAXLEVEL 4
#define MYROUND(a) (( a-floor(a) ) >= .5) ? ceil(a) : floor(a)
enum{INDEX,LOOP,EQUAL,WORLD,UNIVERSE,ULOOP,ATOM};
enum{ARG,OP};
enum{DONE,ADD,SUBTRACT,MULTIPLY,DIVIDE,CARAT,UNARY,
@ -1118,7 +1120,7 @@ double Variable::eval_tree(Tree *tree, int i)
if (tree->type == FLOOR)
return floor(eval_tree(tree->left,i));
if (tree->type == ROUND)
return round(eval_tree(tree->left,i));
return MYROUND(eval_tree(tree->left,i));
return 0.0;
}
@ -1255,7 +1257,7 @@ int Variable::math_function(char *word, char *contents, Tree **tree,
} else if (strcmp(word,"round") == 0) {
if (tree) newtree->type = ROUND;
else argstack[nargstack++] = round(value);
else argstack[nargstack++] = MYROUND(value);
}
return 1;