fix whitespace
This commit is contained in:
@ -184,7 +184,7 @@ void PythonImpl::command(int narg, char **arg)
|
|||||||
// one with no return value
|
// one with no return value
|
||||||
// it also means there is no need to call Variable::pythonstyle() here
|
// it also means there is no need to call Variable::pythonstyle() here
|
||||||
// or even define the pythonstyle() method in Variable ?
|
// or even define the pythonstyle() method in Variable ?
|
||||||
|
|
||||||
invoke_function(ifunc, str, nullptr);
|
invoke_function(ifunc, str, nullptr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -455,7 +455,7 @@ int PythonImpl::function_match(const char *name, const char *varname, int numeri
|
|||||||
{
|
{
|
||||||
// NOTE to Richard - any reason not to put error messages here instead of in Variable class ?
|
// NOTE to Richard - any reason not to put error messages here instead of in Variable class ?
|
||||||
// error messages appear 3x in Variable
|
// error messages appear 3x in Variable
|
||||||
|
|
||||||
int ifunc = find(name);
|
int ifunc = find(name);
|
||||||
if (ifunc < 0) return -1;
|
if (ifunc < 0) return -1;
|
||||||
if (pfuncs[ifunc].noutput == 0) return -2;
|
if (pfuncs[ifunc].noutput == 0) return -2;
|
||||||
@ -481,7 +481,7 @@ int PythonImpl::wrapper_match(const char *name, const char *varname, int narg, i
|
|||||||
{
|
{
|
||||||
// NOTE to Richard - any reason not to put 2 extra error messages here instead of in Variable class ?
|
// NOTE to Richard - any reason not to put 2 extra error messages here instead of in Variable class ?
|
||||||
// only this class knows the name of the missing internal var, so can generate better error message
|
// only this class knows the name of the missing internal var, so can generate better error message
|
||||||
|
|
||||||
int ifunc = function_match(name, varname, 1);
|
int ifunc = function_match(name, varname, 1);
|
||||||
if (ifunc < 0) return ifunc;
|
if (ifunc < 0) return ifunc;
|
||||||
|
|
||||||
@ -494,7 +494,7 @@ int PythonImpl::wrapper_match(const char *name, const char *varname, int narg, i
|
|||||||
// in Python wrapper functions
|
// in Python wrapper functions
|
||||||
// also set internal_var for use by invoke_function()
|
// also set internal_var for use by invoke_function()
|
||||||
// so that invoke_function() is as fast as possible for args which are internal-style vars
|
// so that invoke_function() is as fast as possible for args which are internal-style vars
|
||||||
|
|
||||||
int j = 0;
|
int j = 0;
|
||||||
for (int i = 0; i < pfuncs[ifunc].ninput; i++)
|
for (int i = 0; i < pfuncs[ifunc].ninput; i++)
|
||||||
if (pfuncs[ifunc].ivarflag[i] == INTERNALVAR) {
|
if (pfuncs[ifunc].ivarflag[i] == INTERNALVAR) {
|
||||||
@ -503,7 +503,7 @@ int PythonImpl::wrapper_match(const char *name, const char *varname, int narg, i
|
|||||||
pfuncs[ifunc].internal_var[i] = ivar;
|
pfuncs[ifunc].internal_var[i] = ivar;
|
||||||
argvars[j++] = ivar;
|
argvars[j++] = ivar;
|
||||||
}
|
}
|
||||||
|
|
||||||
return ifunc;
|
return ifunc;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -565,7 +565,7 @@ int PythonImpl::create_entry(char *name, int ninput, int noutput, int length_lon
|
|||||||
char *vname = pfuncs[ifunc].svalue[i];
|
char *vname = pfuncs[ifunc].svalue[i];
|
||||||
int ivar = input->variable->find(vname);
|
int ivar = input->variable->find(vname);
|
||||||
if (ivar < 0) { // create internal variable if does not exist
|
if (ivar < 0) { // create internal variable if does not exist
|
||||||
input->variable->internal_create(vname,0.0);
|
input->variable->internal_create(vname,0.0);
|
||||||
ivar = input->variable->find(vname);
|
ivar = input->variable->find(vname);
|
||||||
}
|
}
|
||||||
if (!input->variable->internalstyle(ivar))
|
if (!input->variable->internalstyle(ivar))
|
||||||
@ -585,7 +585,7 @@ int PythonImpl::create_entry(char *name, int ninput, int noutput, int length_lon
|
|||||||
char *vname = pfuncs[ifunc].svalue[i];
|
char *vname = pfuncs[ifunc].svalue[i];
|
||||||
int ivar = input->variable->find(vname);
|
int ivar = input->variable->find(vname);
|
||||||
if (ivar < 0) { // create internal variable if does not exist
|
if (ivar < 0) { // create internal variable if does not exist
|
||||||
input->variable->internal_create(vname,0.0);
|
input->variable->internal_create(vname,0.0);
|
||||||
ivar = input->variable->find(vname);
|
ivar = input->variable->find(vname);
|
||||||
}
|
}
|
||||||
if (!input->variable->internalstyle(ivar))
|
if (!input->variable->internalstyle(ivar))
|
||||||
|
|||||||
@ -109,7 +109,7 @@ ComputeAngleLocal::ComputeAngleLocal(LAMMPS *lmp, int narg, char **arg) :
|
|||||||
if (tstr) {
|
if (tstr) {
|
||||||
tvar = input->variable->find(tstr);
|
tvar = input->variable->find(tstr);
|
||||||
if (tvar < 0) {
|
if (tvar < 0) {
|
||||||
input->variable->internal_create(tstr,0.0);
|
input->variable->internal_create(tstr,0.0);
|
||||||
tvar = input->variable->find(tstr);
|
tvar = input->variable->find(tstr);
|
||||||
}
|
}
|
||||||
if (!input->variable->internalstyle(tvar))
|
if (!input->variable->internalstyle(tvar))
|
||||||
|
|||||||
@ -155,7 +155,7 @@ ComputeBondLocal::ComputeBondLocal(LAMMPS *lmp, int narg, char **arg) :
|
|||||||
if (dstr) {
|
if (dstr) {
|
||||||
dvar = input->variable->find(dstr);
|
dvar = input->variable->find(dstr);
|
||||||
if (dvar < 0) {
|
if (dvar < 0) {
|
||||||
input->variable->internal_create(dstr,0.0);
|
input->variable->internal_create(dstr,0.0);
|
||||||
dvar = input->variable->find(dstr);
|
dvar = input->variable->find(dstr);
|
||||||
}
|
}
|
||||||
if (!input->variable->internalstyle(dvar))
|
if (!input->variable->internalstyle(dvar))
|
||||||
|
|||||||
@ -103,7 +103,7 @@ ComputeDihedralLocal::ComputeDihedralLocal(LAMMPS *lmp, int narg, char **arg) :
|
|||||||
if (pstr) {
|
if (pstr) {
|
||||||
pvar = input->variable->find(pstr);
|
pvar = input->variable->find(pstr);
|
||||||
if (pvar < 0) {
|
if (pvar < 0) {
|
||||||
input->variable->internal_create(pstr,0.0);
|
input->variable->internal_create(pstr,0.0);
|
||||||
pvar = input->variable->find(pstr);
|
pvar = input->variable->find(pstr);
|
||||||
}
|
}
|
||||||
if (!input->variable->internalstyle(pvar))
|
if (!input->variable->internalstyle(pvar))
|
||||||
|
|||||||
@ -393,7 +393,7 @@ void CreateAtoms::command(int narg, char **arg)
|
|||||||
if (xstr) {
|
if (xstr) {
|
||||||
xvar = input->variable->find(xstr);
|
xvar = input->variable->find(xstr);
|
||||||
if (xvar < 0) {
|
if (xvar < 0) {
|
||||||
input->variable->internal_create(xstr,0.0);
|
input->variable->internal_create(xstr,0.0);
|
||||||
xvar = input->variable->find(xstr);
|
xvar = input->variable->find(xstr);
|
||||||
}
|
}
|
||||||
if (!input->variable->internalstyle(xvar))
|
if (!input->variable->internalstyle(xvar))
|
||||||
@ -402,7 +402,7 @@ void CreateAtoms::command(int narg, char **arg)
|
|||||||
if (ystr) {
|
if (ystr) {
|
||||||
yvar = input->variable->find(ystr);
|
yvar = input->variable->find(ystr);
|
||||||
if (yvar < 0) {
|
if (yvar < 0) {
|
||||||
input->variable->internal_create(ystr,0.0);
|
input->variable->internal_create(ystr,0.0);
|
||||||
yvar = input->variable->find(ystr);
|
yvar = input->variable->find(ystr);
|
||||||
}
|
}
|
||||||
if (!input->variable->internalstyle(yvar))
|
if (!input->variable->internalstyle(yvar))
|
||||||
@ -411,7 +411,7 @@ void CreateAtoms::command(int narg, char **arg)
|
|||||||
if (zstr) {
|
if (zstr) {
|
||||||
zvar = input->variable->find(zstr);
|
zvar = input->variable->find(zstr);
|
||||||
if (zvar < 0) {
|
if (zvar < 0) {
|
||||||
input->variable->internal_create(zstr,0.0);
|
input->variable->internal_create(zstr,0.0);
|
||||||
zvar = input->variable->find(zstr);
|
zvar = input->variable->find(zstr);
|
||||||
}
|
}
|
||||||
if (!input->variable->internalstyle(zvar))
|
if (!input->variable->internalstyle(zvar))
|
||||||
|
|||||||
@ -869,7 +869,7 @@ void FixDeposit::options(int narg, char **arg)
|
|||||||
if (xstr) {
|
if (xstr) {
|
||||||
xvar = input->variable->find(xstr);
|
xvar = input->variable->find(xstr);
|
||||||
if (xvar < 0) {
|
if (xvar < 0) {
|
||||||
input->variable->internal_create(xstr,0.0);
|
input->variable->internal_create(xstr,0.0);
|
||||||
xvar = input->variable->find(xstr);
|
xvar = input->variable->find(xstr);
|
||||||
}
|
}
|
||||||
if (!input->variable->internalstyle(xvar))
|
if (!input->variable->internalstyle(xvar))
|
||||||
@ -878,7 +878,7 @@ void FixDeposit::options(int narg, char **arg)
|
|||||||
if (ystr) {
|
if (ystr) {
|
||||||
yvar = input->variable->find(ystr);
|
yvar = input->variable->find(ystr);
|
||||||
if (yvar < 0) {
|
if (yvar < 0) {
|
||||||
input->variable->internal_create(ystr,0.0);
|
input->variable->internal_create(ystr,0.0);
|
||||||
yvar = input->variable->find(ystr);
|
yvar = input->variable->find(ystr);
|
||||||
}
|
}
|
||||||
if (!input->variable->internalstyle(yvar))
|
if (!input->variable->internalstyle(yvar))
|
||||||
@ -887,7 +887,7 @@ void FixDeposit::options(int narg, char **arg)
|
|||||||
if (zstr) {
|
if (zstr) {
|
||||||
zvar = input->variable->find(zstr);
|
zvar = input->variable->find(zstr);
|
||||||
if (zvar < 0) {
|
if (zvar < 0) {
|
||||||
input->variable->internal_create(zstr,0.0);
|
input->variable->internal_create(zstr,0.0);
|
||||||
zvar = input->variable->find(zstr);
|
zvar = input->variable->find(zstr);
|
||||||
}
|
}
|
||||||
if (!input->variable->internalstyle(zvar))
|
if (!input->variable->internalstyle(zvar))
|
||||||
|
|||||||
@ -4223,7 +4223,7 @@ int Variable::math_function(char *word, char *contents, Tree **tree, Tree **tree
|
|||||||
data[ivar][0],names[ivar]);
|
data[ivar][0],names[ivar]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if tree: store python variable and arg info in tree for later eval
|
// if tree: store python variable and arg info in tree for later eval
|
||||||
// else: one-time eval of python-coded function now via python variable
|
// else: one-time eval of python-coded function now via python variable
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user