lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2009-08-13 17:33:39 +00:00
parent 15164afd0a
commit 70378d5ef4
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/force.cpp
View File

@ -486,7 +486,7 @@ double Force::numeric(char *str)
int n = strlen(str);
for (int i = 0; i < n; i++) {
if (isdigit(str[i])) continue;
if (str[i] == '-' || str[i] == '.') continue;
if (str[i] == '-' || str[i] == '+' || str[i] == '.') continue;
if (str[i] == 'e' || str[i] == 'E') continue;
error->all("Expecting floating point argument in input script");
}
@ -504,7 +504,7 @@ int Force::inumeric(char *str)
{
int n = strlen(str);
for (int i = 0; i < n; i++) {
if (isdigit(str[i]) || str[i] == '-') continue;
if (isdigit(str[i]) || str[i] == '-' || str[i] == '+') continue;
error->all("Expecting integer argument in input script");
}

16
src/thermo.cpp
View File

@ -805,22 +805,6 @@ int Thermo::add_variable(const char *id)
return nvariable-1;
}
/* ----------------------------------------------------------------------
create a Compute object for group all
------------------------------------------------------------------------- */
void Thermo::create_compute(char *id, char *cstyle, char *extra)
{
char **newarg = new char*[4];
newarg[0] = id;
newarg[1] = (char *) "all";
newarg[2] = cstyle;
if (extra) newarg[3] = extra;
if (extra) modify->add_compute(4,newarg);
else modify->add_compute(3,newarg);
delete [] newarg;
}
/* ----------------------------------------------------------------------
compute a single thermodyanmic value, word is any keyword in custom list
called when a variable is evaluated by Variable class

1
src/thermo.h
View File

@ -94,7 +94,6 @@ class Thermo : protected Pointers {
int add_compute(const char *, int);
int add_fix(const char *);
int add_variable(const char *);
void create_compute(char *, char *, char *);
typedef void (Thermo::*FnPtr)();
void addfield(const char *, FnPtr, int);