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

remove pointless check

Browse Source
This commit is contained in:
Axel Kohlmeyer
2024-07-06 09:55:41 -04:00
parent f34b6dacaf
commit 54901eb8a4
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fix_indent.cpp
View File

@ -61,6 +61,7 @@ FixIndent::FixIndent(LAMMPS *lmp, int narg, char **arg) :
// read geometry of indenter and optional args // read geometry of indenter and optional args
istyle = NONE;
int iarg = geometry(narg - 4, &arg[4]) + 4; int iarg = geometry(narg - 4, &arg[4]) + 4;
options(narg - iarg, &arg[iarg]); options(narg - iarg, &arg[iarg]);
@ -474,14 +475,12 @@ int FixIndent::geometry(int narg, char **arg)
{ {
if (narg < 0) utils::missing_cmd_args(FLERR, "fix indent", error); if (narg < 0) utils::missing_cmd_args(FLERR, "fix indent", error);
istyle = NONE;
xstr = ystr = zstr = rstr = pstr = nullptr; xstr = ystr = zstr = rstr = pstr = nullptr;
xvalue = yvalue = zvalue = rvalue = pvalue = 0.0; xvalue = yvalue = zvalue = rvalue = pvalue = 0.0;
// sphere // sphere
if (strcmp(arg[0], "sphere") == 0) { if (strcmp(arg[0], "sphere") == 0) {
if (istyle != NONE) error->all(FLERR, "Fix indent requires a single geometry keyword");
if (5 > narg) utils::missing_cmd_args(FLERR, "fix indent sphere", error); if (5 > narg) utils::missing_cmd_args(FLERR, "fix indent sphere", error);
if (utils::strmatch(arg[1], "^v_")) { if (utils::strmatch(arg[1], "^v_")) {
@ -508,7 +507,6 @@ int FixIndent::geometry(int narg, char **arg)
// cylinder // cylinder
if (strcmp(arg[0], "cylinder") == 0) { if (strcmp(arg[0], "cylinder") == 0) {
if (istyle != NONE) error->all(FLERR, "Fix indent requires a single geometry keyword");
if (5 > narg) utils::missing_cmd_args(FLERR, "fix indent cylinder", error); if (5 > narg) utils::missing_cmd_args(FLERR, "fix indent cylinder", error);
if (strcmp(arg[1], "x") == 0) { if (strcmp(arg[1], "x") == 0) {
@ -556,7 +554,6 @@ int FixIndent::geometry(int narg, char **arg)
// cone // cone
if (strcmp(arg[0], "cone") == 0) { if (strcmp(arg[0], "cone") == 0) {
if (istyle != NONE) error->all(FLERR, "Fix indent requires a single geometry keyword");
if (8 > narg) utils::missing_cmd_args(FLERR, "fix indent cone", error); if (8 > narg) utils::missing_cmd_args(FLERR, "fix indent cone", error);
if (strcmp(arg[1], "x") == 0) { if (strcmp(arg[1], "x") == 0) {
@ -619,7 +616,6 @@ int FixIndent::geometry(int narg, char **arg)
// plane // plane
if (strcmp(arg[0], "plane") == 0) { if (strcmp(arg[0], "plane") == 0) {
if (istyle != NONE) error->all(FLERR, "Fix indent requires a single geometry keyword");
if (4 > narg) utils::missing_cmd_args(FLERR, "fix indent plane", error); if (4 > narg) utils::missing_cmd_args(FLERR, "fix indent plane", error);
if (strcmp(arg[1], "x") == 0) if (strcmp(arg[1], "x") == 0)
cdim = 0; cdim = 0;
@ -647,7 +643,7 @@ int FixIndent::geometry(int narg, char **arg)
// invalid istyle arg // invalid istyle arg
error->all(FLERR, "Unknown fix indent argument: {}", arg[0]); error->all(FLERR, "Unknown fix indent geometry: {}", arg[0]);
return 0; return 0;
} }