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

Browse Source
This commit is contained in:
sjplimp
2015-04-02 14:06:11 +00:00
parent fc790f1b35
commit 8292ea5b00
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dump_image.cpp
View File

@ -1047,8 +1047,11 @@ int DumpImage::modify_param(int narg, char **arg)
if (strcmp(arg[0],"amap") == 0) { if (strcmp(arg[0],"amap") == 0) {
if (narg < 6) error->all(FLERR,"Illegal dump_modify command"); if (narg < 6) error->all(FLERR,"Illegal dump_modify command");
if (strlen(arg[3]) != 2) error->all(FLERR,"Illegal dump_modify command"); if (strlen(arg[3]) != 2) error->all(FLERR,"Illegal dump_modify command");
int factor = 2; int factor;
if (arg[3][0] == 's') factor = 1; if (arg[3][0] == 's') factor = 1;
else if (arg[3][0] == 'c') factor = 2;
else if (arg[3][0] == 'd') factor = 3;
else error->all(FLERR,"Illegal dump_modify command");
int nentry = force->inumeric(FLERR,arg[5]); int nentry = force->inumeric(FLERR,arg[5]);
if (nentry < 1) error->all(FLERR,"Illegal dump_modify command"); if (nentry < 1) error->all(FLERR,"Illegal dump_modify command");
int n = 6 + factor*nentry; int n = 6 + factor*nentry;

8
src/image.cpp
View File

@ -1756,14 +1756,14 @@ int ColorMap::reset(int narg, char **arg)
if (!islower(arg[n][0])) { if (!islower(arg[n][0])) {
mentry[i].lo = NUMERIC; mentry[i].lo = NUMERIC;
mentry[i].lvalue = force->numeric(FLERR,arg[n]); mentry[i].lvalue = force->numeric(FLERR,arg[n]);
} else if (strcmp(arg[n],"min") == 0) mentry[i].single = MINVALUE; } else if (strcmp(arg[n],"min") == 0) mentry[i].lo = MINVALUE;
else if (strcmp(arg[n],"max") == 0) mentry[i].single = MAXVALUE; else if (strcmp(arg[n],"max") == 0) mentry[i].lo = MAXVALUE;
else return 1; else return 1;
if (!islower(arg[n+1][0])) { if (!islower(arg[n+1][0])) {
mentry[i].hi = NUMERIC; mentry[i].hi = NUMERIC;
mentry[i].hvalue = force->numeric(FLERR,arg[n+1]); mentry[i].hvalue = force->numeric(FLERR,arg[n+1]);
} else if (strcmp(arg[n+1],"min") == 0) mentry[i].single = MINVALUE; } else if (strcmp(arg[n+1],"min") == 0) mentry[i].hi = MINVALUE;
else if (strcmp(arg[n+1],"max") == 0) mentry[i].single = MAXVALUE; else if (strcmp(arg[n+1],"max") == 0) mentry[i].hi = MAXVALUE;
else return 1; else return 1;
mentry[i].color = image->color2rgb(arg[n+2]); mentry[i].color = image->color2rgb(arg[n+2]);
n += 3; n += 3;