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

Browse Source
This commit is contained in:
sjplimp
2012-06-27 15:41:20 +00:00
parent bd0a01b5ba
commit ad9d691685
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fix_aveforce.cpp
View File

@ -128,19 +128,22 @@ void FixAveForce::init()
if (xstr) { if (xstr) {
xvar = input->variable->find(xstr); xvar = input->variable->find(xstr);
if (xvar < 0) error->all(FLERR,"Variable name for fix aveforce does not exist"); if (xvar < 0)
error->all(FLERR,"Variable name for fix aveforce does not exist");
if (input->variable->equalstyle(xvar)) xstyle = EQUAL; if (input->variable->equalstyle(xvar)) xstyle = EQUAL;
else error->all(FLERR,"Variable for fix aveforce is invalid style"); else error->all(FLERR,"Variable for fix aveforce is invalid style");
} }
if (ystr) { if (ystr) {
yvar = input->variable->find(ystr); yvar = input->variable->find(ystr);
if (yvar < 0) error->all(FLERR,"Variable name for fix aveforce does not exist"); if (yvar < 0)
error->all(FLERR,"Variable name for fix aveforce does not exist");
if (input->variable->equalstyle(yvar)) ystyle = EQUAL; if (input->variable->equalstyle(yvar)) ystyle = EQUAL;
else error->all(FLERR,"Variable for fix aveforce is invalid style"); else error->all(FLERR,"Variable for fix aveforce is invalid style");
} }
if (zstr) { if (zstr) {
zvar = input->variable->find(zstr); zvar = input->variable->find(zstr);
if (zvar < 0) error->all(FLERR,"Variable name for fix aveforce does not exist"); if (zvar < 0)
error->all(FLERR,"Variable name for fix aveforce does not exist");
if (input->variable->equalstyle(zvar)) zstyle = EQUAL; if (input->variable->equalstyle(zvar)) zstyle = EQUAL;
else error->all(FLERR,"Variable for fix aveforce is invalid style"); else error->all(FLERR,"Variable for fix aveforce is invalid style");
} }
@ -149,7 +152,8 @@ void FixAveForce::init()
if (iregion >= 0) { if (iregion >= 0) {
iregion = domain->find_region(idregion); iregion = domain->find_region(idregion);
if (iregion == -1) error->all(FLERR,"Region ID for fix aveforce does not exist"); if (iregion == -1)
error->all(FLERR,"Region ID for fix aveforce does not exist");
} }
if (xstyle == EQUAL || ystyle == EQUAL || zstyle == EQUAL) varflag = EQUAL; if (xstyle == EQUAL || ystyle == EQUAL || zstyle == EQUAL) varflag = EQUAL;