From 039af550a04f2766b9b95bb5382915bf65e02348 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Mon, 10 Mar 2014 22:16:34 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11626 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/variable.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/variable.cpp b/src/variable.cpp index 04dbd81d3b..b9c5152d1e 100644 --- a/src/variable.cpp +++ b/src/variable.cpp @@ -3941,7 +3941,7 @@ unsigned int Variable::data_mask(char *str) { unsigned int datamask = EMPTY_MASK; - for (unsigned int i=0; i < strlen(str)-2; i++) { + for (unsigned int i = 0; i < strlen(str)-2; i++) { int istart = i; while (isalnum(str[i]) || str[i] == '_') i++; int istop = i-1; @@ -3974,21 +3974,21 @@ unsigned int Variable::data_mask(char *str) } if ((strncmp(word,"f_",2) == 0) && (i>0) && (!isalnum(str[i-1]))) { - if (domain->box_exist == 0) - error->all(FLERR, - "Variable evaluation before simulation box is defined"); - - n = strlen(word) - 2 + 1; - char *id = new char[n]; - strcpy(id,&word[2]); - - int ifix = modify->find_fix(id); - if (ifix < 0) error->all(FLERR,"Invalid fix ID in variable formula"); - - datamask &= modify->fix[ifix]->data_mask(); - delete [] id; + if (domain->box_exist == 0) + error->all(FLERR, + "Variable evaluation before simulation box is defined"); + + n = strlen(word) - 2 + 1; + char *id = new char[n]; + strcpy(id,&word[2]); + + int ifix = modify->find_fix(id); + if (ifix < 0) error->all(FLERR,"Invalid fix ID in variable formula"); + + datamask &= modify->fix[ifix]->data_mask(); + delete [] id; } - + if ((strncmp(word,"v_",2) == 0) && (i>0) && (!isalnum(str[i-1]))) { int ivar = find(word); datamask &= data_mask(ivar);