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

This commit is contained in:
sjplimp
2011-09-23 18:06:55 +00:00
parent 2d99de131d
commit 19e8c92a90
468 changed files with 4628 additions and 5204 deletions

View File

@ -27,7 +27,7 @@ using namespace LAMMPS_NS;
FixViscous::FixViscous(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg)
{
if (narg < 4) error->all("Illegal fix viscous command");
if (narg < 4) error->all(FLERR,"Illegal fix viscous command");
double gamma_one = atof(arg[3]);
gamma = new double[atom->ntypes+1];
@ -38,14 +38,14 @@ FixViscous::FixViscous(LAMMPS *lmp, int narg, char **arg) :
int iarg = 4;
while (iarg < narg) {
if (strcmp(arg[iarg],"scale") == 0) {
if (iarg+3 > narg) error->all("Illegal fix viscous command");
if (iarg+3 > narg) error->all(FLERR,"Illegal fix viscous command");
int itype = atoi(arg[iarg+1]);
double scale = atof(arg[iarg+2]);
if (itype <= 0 || itype > atom->ntypes)
error->all("Illegal fix viscous command");
error->all(FLERR,"Illegal fix viscous command");
gamma[itype] = gamma_one * scale;
iarg += 3;
} else error->all("Illegal fix viscous command");
} else error->all(FLERR,"Illegal fix viscous command");
}
}