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

fix issues from moving code and incorrect merge conflict resolution

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-09-10 04:35:13 -04:00
parent f700da5ac3
commit 4cca198adf
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dump.cpp
View File

@ -169,7 +169,6 @@ Dump::~Dump()
delete[] format_bigint_user; delete[] format_bigint_user;
delete[] refresh; delete[] refresh;
delete[] skipvar; delete[] skipvar;
// format_column_user is deallocated by child classes that use it // format_column_user is deallocated by child classes that use it
@ -1070,7 +1069,7 @@ void Dump::modify_params(int narg, char **arg)
iarg += 2; iarg += 2;
} else if (strcmp(arg[iarg],"balance") == 0) { } else if (strcmp(arg[iarg],"balance") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal dump_modify command"); if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify balance", error);
if (nprocs > 1) if (nprocs > 1)
balance_flag = utils::logical(FLERR,arg[iarg+1],false,lmp); balance_flag = utils::logical(FLERR,arg[iarg+1],false,lmp);
iarg += 2; iarg += 2;
@ -1083,12 +1082,12 @@ void Dump::modify_params(int narg, char **arg)
iarg += 2; iarg += 2;
} else if (strcmp(arg[iarg],"colname") == 0) { } else if (strcmp(arg[iarg],"colname") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal dump_modify command"); if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify colname", error);
if (strcmp(arg[iarg+1],"default") == 0) { if (strcmp(arg[iarg+1],"default") == 0) {
for (auto &item : keyword_user) item.clear(); for (auto &item : keyword_user) item.clear();
iarg += 2; iarg += 2;
} else { } else {
if (iarg+3 > narg) error->all(FLERR,"Illegal dump_modify command"); if (iarg+3 > narg) utils::missing_cmd_args(FLERR, "dump_modify colname", error);
int icol = -1; int icol = -1;
if (utils::is_integer(arg[iarg + 1])) { if (utils::is_integer(arg[iarg + 1])) {
icol = utils::inumeric(FLERR,arg[iarg + 1],false,lmp); icol = utils::inumeric(FLERR,arg[iarg + 1],false,lmp);
@ -1318,12 +1317,6 @@ void Dump::modify_params(int narg, char **arg)
} }
iarg += 2; iarg += 2;
} else if (strcmp(arg[iarg],"balance") == 0) {
if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify blance", error);
if (nprocs > 1)
balance_flag = utils::logical(FLERR,arg[iarg+1],false,lmp);
iarg += 2;
} else if (strcmp(arg[iarg],"time") == 0) { } else if (strcmp(arg[iarg],"time") == 0) {
if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify time", error); if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify time", error);
time_flag = utils::logical(FLERR,arg[iarg+1],false,lmp); time_flag = utils::logical(FLERR,arg[iarg+1],false,lmp);