ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the last change to modify_params function

Browse Source
This commit is contained in:
Jiancheng Chen
2022-08-14 10:21:49 +08:00
parent d599a541b5
commit 3292ee8299
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dump.cpp
View File

@ -1183,7 +1183,7 @@ void Dump::modify_params(int narg, char **arg)
iarg += 3; iarg += 3;
} else { // pass other format options to child classes } else { // pass other format options to child classes
int n = modify_param(narg-iarg,&arg[iarg]); int n = modify_param(narg-iarg,&arg[iarg]);
if (n == 0) utils::missing_cmd_args(FLERR, "dump_modify", error); if (n == 0) error->all(FLERR,"Unknown dump_modify format keyword: {}", arg[iarg+1]);
iarg += n; iarg += n;
} }
@ -1292,7 +1292,7 @@ void Dump::modify_params(int narg, char **arg)
} else { } else {
int n = modify_param(narg-iarg,&arg[iarg]); int n = modify_param(narg-iarg,&arg[iarg]);
if (n == 0) utils::missing_cmd_args(FLERR, "dump_modify", error); if (n == 0) error->all(FLERR,"Unknown dump_modify keyword: {}", arg[iarg]);
iarg += n; iarg += n;
} }
} }

12
src/dump_custom.cpp
View File

@ -1673,7 +1673,7 @@ int DumpCustom::modify_param(int narg, char **arg)
} }
if (strcmp(arg[0],"format") == 0) { if (strcmp(arg[0],"format") == 0) {
if (narg < 2) error->all(FLERR,"Illegal dump_modify command"); if (narg < 2) utils::missing_cmd_args(FLERR, "dump_modify format", error);
if (strcmp(arg[1],"none") == 0) { if (strcmp(arg[1],"none") == 0) {
// just clear format_column_user allocated by this dump child class // just clear format_column_user allocated by this dump child class
@ -1684,7 +1684,7 @@ int DumpCustom::modify_param(int narg, char **arg)
return 2; return 2;
} }
if (narg < 3) error->all(FLERR,"Illegal dump_modify command"); if (narg < 3) utils::missing_cmd_args(FLERR, "dump_modify format", error);
if (strcmp(arg[1],"int") == 0) { if (strcmp(arg[1],"int") == 0) {
delete[] format_int_user; delete[] format_int_user;
@ -1710,7 +1710,7 @@ int DumpCustom::modify_param(int narg, char **arg)
} else { } else {
int i = utils::inumeric(FLERR,arg[1],false,lmp) - 1; int i = utils::inumeric(FLERR,arg[1],false,lmp) - 1;
if (i < 0 || i >= nfield) if (i < 0 || i >= nfield)
error->all(FLERR,"Illegal dump_modify command"); error->all(FLERR,"Unknown dump_modify format ID keyword: {}", arg[1]);
delete[] format_column_user[i]; delete[] format_column_user[i];
format_column_user[i] = utils::strdup(arg[2]); format_column_user[i] = utils::strdup(arg[2]);
} }
@ -1731,7 +1731,7 @@ int DumpCustom::modify_param(int narg, char **arg)
} }
if (strcmp(arg[0],"refresh") == 0) { if (strcmp(arg[0],"refresh") == 0) {
if (narg < 2) error->all(FLERR,"Illegal dump_modify command"); if (narg < 2) utils::missing_cmd_args(FLERR, "dump_modify refresh", error);
ArgInfo argi(arg[1],ArgInfo::COMPUTE); ArgInfo argi(arg[1],ArgInfo::COMPUTE);
if ((argi.get_type() != ArgInfo::COMPUTE) || (argi.get_dim() != 0)) if ((argi.get_type() != ArgInfo::COMPUTE) || (argi.get_dim() != 0))
error->all(FLERR,"Illegal dump_modify command"); error->all(FLERR,"Illegal dump_modify command");
@ -1743,7 +1743,7 @@ int DumpCustom::modify_param(int narg, char **arg)
} }
if (strcmp(arg[0],"thresh") == 0) { if (strcmp(arg[0],"thresh") == 0) {
if (narg < 2) error->all(FLERR,"Illegal dump_modify command"); if (narg < 2) utils::missing_cmd_args(FLERR, "dump_modify thresh", error);
if (strcmp(arg[1],"none") == 0) { if (strcmp(arg[1],"none") == 0) {
if (nthresh) { if (nthresh) {
memory->destroy(thresh_array); memory->destroy(thresh_array);
@ -1765,7 +1765,7 @@ int DumpCustom::modify_param(int narg, char **arg)
return 2; return 2;
} }
if (narg < 4) error->all(FLERR,"Illegal dump_modify command"); if (narg < 4) utils::missing_cmd_args(FLERR, "dump_modify thresh", error);
// grow threshold arrays // grow threshold arrays