jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@511 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp 2007-04-20 22:55:27 +00:00
parent 8d2d6b68a3
commit 59cfd438ae
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compute_variable.cpp
View File

@ -21,8 +21,6 @@
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
enum{INDEX,LOOP,EQUAL,WORLD,UNIVERSE,ULOOP,ATOM}; // also in variable.cpp
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
ComputeVariable::ComputeVariable(LAMMPS *lmp, int narg, char **arg) : ComputeVariable::ComputeVariable(LAMMPS *lmp, int narg, char **arg) :

2
src/compute_variable_atom.cpp
View File

@ -21,8 +21,6 @@
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
enum{INDEX,LOOP,EQUAL,WORLD,UNIVERSE,ULOOP,ATOM}; // also in variable.cpp
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
ComputeVariableAtom::ComputeVariableAtom(LAMMPS *lmp, int narg, char **arg) : ComputeVariableAtom::ComputeVariableAtom(LAMMPS *lmp, int narg, char **arg) :

4
src/variable.cpp
View File

@ -307,6 +307,7 @@ int Variable::next(int narg, char **arg)
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
return ptr to the data text associated with a variable return ptr to the data text associated with a variable
if EQUAL var, evaluates variable and puts result in str
return NULL if no variable or index is bad, caller must respond return NULL if no variable or index is bad, caller must respond
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
@ -829,7 +830,8 @@ double Variable::evaluate(char *str, Tree *tree)
void Variable::build_parse_tree(int ivar) void Variable::build_parse_tree(int ivar)
{ {
if (style[ivar] != ATOM) error->all(""); if (style[ivar] != ATOM)
error->all("Cannot build parse tree for non atom style variable");
ptree = new Tree(); ptree = new Tree();
double tmp = evaluate(data[ivar][0],ptree); double tmp = evaluate(data[ivar][0],ptree);
} }