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

include patch by daniel schwen to check if a variable is define

Browse Source
This commit is contained in:
Axel Kohlmeyer
2013-10-29 07:52:33 +01:00
parent f84a39b9d1
commit 8b86fa2fa2
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/variable.cpp
View File

@ -63,7 +63,7 @@ enum{DONE,ADD,SUBTRACT,MULTIPLY,DIVIDE,CARAT,MODULO,UNARY,
// customize by adding a special function
enum{SUM,XMIN,XMAX,AVE,TRAP,NEXT};
enum{SUM,XMIN,XMAX,AVE,TRAP,NEXT,ISDEF};
#define INVOKED_SCALAR 1
#define INVOKED_VECTOR 2
@ -3047,6 +3047,7 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
if (strcmp(word,"sum") && strcmp(word,"min") && strcmp(word,"max") &&
strcmp(word,"ave") && strcmp(word,"trap") && strcmp(word,"gmask") &&
strcmp(word,"isdef") &&
strcmp(word,"rmask") && strcmp(word,"grmask") && strcmp(word,"next"))
return 0;
@ -3270,6 +3271,28 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
newtree->left = newtree->middle = newtree->right = NULL;
treestack[ntreestack++] = newtree;
// check if a variable is defined
} else if (strcmp(word,"isdef") == 0) {
int vartype;
if (narg != 1)
error->all(FLERR,"Invalid special function isdef in variable formula");
int ivar = find(arg1);
if (ivar == -1)
vartype = 0;
else
vartype = style[ivar]+1;
if (tree) {
Tree *newtree = new Tree();
newtree->type = VALUE;
newtree->value = double(vartype);
newtree->left = newtree->middle = newtree->right = NULL;
treestack[ntreestack++] = newtree;
} else argstack[nargstack++] = double(vartype);
// special function for file-style or atomfile-style variables
} else if (strcmp(word,"next") == 0) {