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

add deprecation handling removed commands and styles

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-04-08 17:25:56 -04:00
parent 792ae5dae5
commit f405c7acc9
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/deprecated.cpp
View File

@ -1,4 +1,3 @@
// clang-format off
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
https://www.lammps.org/, Sandia National Laboratories https://www.lammps.org/, Sandia National Laboratories
@ -31,16 +30,16 @@ void Deprecated::command(int narg, char **arg)
const std::string cmd = input->command; const std::string cmd = input->command;
if (cmd == "DEPRECATED") { if (cmd == "DEPRECATED") {
if (lmp->comm->me == 0) if (lmp->comm->me == 0) utils::logmesg(lmp, "\nCommand 'DEPRECATED' is a dummy command\n\n");
utils::logmesg(lmp,"\nCommand 'DEPRECATED' is a dummy command\n\n");
return; return;
} else if (cmd == "reset_ids") { } else if (cmd == "reset_ids") {
if (lmp->comm->me == 0) if (lmp->comm->me == 0)
utils::logmesg(lmp, "\n'reset_ids' has been renamed to 'reset_atom_ids'\n\n"); utils::logmesg(lmp, "\n'reset_ids' has been renamed to 'reset_atom_ids'\n\n");
} else if (utils::strmatch(cmd, "^kim_")) { } else if (utils::strmatch(cmd, "^kim_")) {
if (lmp->comm->me == 0) if (lmp->comm->me == 0)
utils::logmesg(lmp,"\nWARNING: 'kim_<command>' has been renamed to " utils::logmesg(lmp,
"'kim <command>'. Please update your input.\n\n"); "\nWARNING: 'kim_<command>' has been renamed to 'kim <command>'. "
"Please update your input.\n\n");
std::string newcmd("kim"); std::string newcmd("kim");
newcmd += " " + cmd.substr(4); newcmd += " " + cmd.substr(4);
for (int i = 0; i < narg; ++i) { for (int i = 0; i < narg; ++i) {
@ -49,6 +48,9 @@ void Deprecated::command(int narg, char **arg)
} }
input->one(newcmd); input->one(newcmd);
return; return;
} else if ((cmd == "message") || (cmd == "server")) {
if (lmp->comm->me == 0)
utils::logmesg(lmp, "\nThe MESSAGE package has been replaced by the MDI package.\n\n");
} }
error->all(FLERR, "This command is no longer available"); error->all(FLERR, "This command is no longer available");
} }

2
src/deprecated.h
View File

@ -20,6 +20,8 @@ CommandStyle(kim_interactions,Deprecated);
CommandStyle(kim_param,Deprecated); CommandStyle(kim_param,Deprecated);
CommandStyle(kim_property,Deprecated); CommandStyle(kim_property,Deprecated);
CommandStyle(kim_query,Deprecated); CommandStyle(kim_query,Deprecated);
CommandStyle(message,Deprecated);
CommandStyle(server,Deprecated);
// clang-format on // clang-format on
#else #else

6
src/fix_deprecated.cpp
View File

@ -46,10 +46,12 @@ FixDeprecated::FixDeprecated(LAMMPS *lmp, int narg, char **arg) :
} else if (my_style == "lb/pc") { } else if (my_style == "lb/pc") {
utils::logmesg(lmp,"\nFix style 'lb/pc' has been removed from the LATBOLTZ" utils::logmesg(lmp,"\nFix style 'lb/pc' has been removed from the LATBOLTZ"
" package; 'fix nve' can be used in its place.\n\n"); " package; 'fix nve' can be used in its place.\n\n");
} } else if (my_style == "lb/rigid/pc/sphere") {
else if (my_style == "lb/rigid/pc/sphere") {
utils::logmesg(lmp,"\nFix style 'lb/rigid/pc/sphere' has been removed from" utils::logmesg(lmp,"\nFix style 'lb/rigid/pc/sphere' has been removed from"
" the LATBOLTZ package; 'fix rigid' can be used in its place.\n\n"); " the LATBOLTZ package; 'fix rigid' can be used in its place.\n\n");
} else if (my_style == "client/md") {
if (lmp->comm->me == 0)
utils::logmesg(lmp, "\nThe MESSAGE package has been replaced by the MDI package.\n\n");
} }
error->all(FLERR,"This fix style is no longer available"); error->all(FLERR,"This fix style is no longer available");
} }

1
src/fix_deprecated.h
View File

@ -19,6 +19,7 @@ FixStyle(ave/spatial,FixDeprecated);
FixStyle(ave/spatial/sphere,FixDeprecated); FixStyle(ave/spatial/sphere,FixDeprecated);
FixStyle(lb/pc,FixDeprecated); FixStyle(lb/pc,FixDeprecated);
FixStyle(lb/rigid/pc/sphere,FixDeprecated); FixStyle(lb/rigid/pc/sphere,FixDeprecated);
FixStyle(client/md,FixDeprecated);
// clang-format on // clang-format on
#else #else