From f0505813632b789515743fc238bcdfd9fd8b2cea Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sat, 10 Sep 2022 04:53:38 -0400 Subject: [PATCH] move keywords to be sorted alphabetically --- src/dump.cpp | 63 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/src/dump.cpp b/src/dump.cpp index 247da8595a..d9dc8df7c6 100644 --- a/src/dump.cpp +++ b/src/dump.cpp @@ -1044,6 +1044,12 @@ void Dump::modify_params(int narg, char **arg) append_flag = utils::logical(FLERR,arg[iarg+1],false,lmp); iarg += 2; + } else if (strcmp(arg[iarg],"balance") == 0) { + if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify balance", error); + if (nprocs > 1) + balance_flag = utils::logical(FLERR,arg[iarg+1],false,lmp); + iarg += 2; + } else if (strcmp(arg[iarg],"buffer") == 0) { if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify buffer", error); buffer_flag = utils::logical(FLERR,arg[iarg+1],false,lmp); @@ -1051,6 +1057,32 @@ void Dump::modify_params(int narg, char **arg) error->all(FLERR,"Dump_modify buffer yes not allowed for this style"); iarg += 2; + } else if (strcmp(arg[iarg],"colname") == 0) { + if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify colname", error); + if (strcmp(arg[iarg+1],"default") == 0) { + for (auto &item : keyword_user) item.clear(); + iarg += 2; + } else { + if (iarg+3 > narg) utils::missing_cmd_args(FLERR, "dump_modify colname", error); + int icol = -1; + if (utils::is_integer(arg[iarg + 1])) { + icol = utils::inumeric(FLERR,arg[iarg + 1],false,lmp); + if (icol < 0) icol = keyword_user.size() + icol + 1; + icol--; + } else { + try { + icol = key2col.at(arg[iarg + 1]); + } catch (std::out_of_range &) { + icol = -1; + } + } + if ((icol < 0) || (icol >= (int)keyword_user.size())) + error->all(FLERR, "Incorrect dump_modify arguments: {} {} {}", + arg[iarg], arg[iarg+1], arg[iarg+2]); + keyword_user[icol] = arg[iarg+2]; + iarg += 3; + } + } else if (strcmp(arg[iarg],"delay") == 0) { if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify delay", error); delaystep = utils::bnumeric(FLERR,arg[iarg+1],false,lmp); @@ -1133,31 +1165,6 @@ void Dump::modify_params(int narg, char **arg) flush_flag = utils::logical(FLERR,arg[iarg+1],false,lmp); iarg += 2; - } else if (strcmp(arg[iarg],"colname") == 0) { - if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify colname", error); - if (strcmp(arg[iarg+1],"default") == 0) { - for (auto &item : keyword_user) item.clear(); - iarg += 2; - } else { - if (iarg+3 > narg) utils::missing_cmd_args(FLERR, "dump_modify colname", error); - int icol = -1; - if (utils::is_integer(arg[iarg + 1])) { - icol = utils::inumeric(FLERR,arg[iarg + 1],false,lmp); - if (icol < 0) icol = keyword_user.size() + icol + 1; - icol--; - } else { - try { - icol = key2col.at(arg[iarg + 1]); - } catch (std::out_of_range &) { - icol = -1; - } - } - if ((icol < 0) || (icol >= (int)keyword_user.size())) - error->all(FLERR, "Incorrect dump_modify arguments: {} {} {}", - arg[iarg], arg[iarg+1], arg[iarg+2]); - keyword_user[icol] = arg[iarg+2]; - iarg += 3; - } } else if (strcmp(arg[iarg],"format") == 0) { if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify format", error); @@ -1276,12 +1283,6 @@ void Dump::modify_params(int narg, char **arg) } 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) { if (iarg+2 > narg) utils::missing_cmd_args(FLERR, "dump_modify time", error); time_flag = utils::logical(FLERR,arg[iarg+1],false,lmp);