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

silence compiler warnings

Browse Source
This commit is contained in:
Axel Kohlmeyer
2024-02-22 05:07:08 -05:00
parent 00615d94ad
commit 3ff2b1b43b
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/EXTRA-FIX/fix_deform_pressure.cpp
View File

@ -58,7 +58,7 @@ FixDeformPressure::FixDeformPressure(LAMMPS *lmp, int narg, char **arg) :
// parse only parameter/style arguments specific to this child class // parse only parameter/style arguments specific to this child class
int index, iarg; int index, iarg;
int i = 0; std::size_t i = 0;
while (i < leftover_iarg.size()) { while (i < leftover_iarg.size()) {
iarg = leftover_iarg[i]; iarg = leftover_iarg[i];
if (strcmp(arg[iarg], "x") == 0 || if (strcmp(arg[iarg], "x") == 0 ||
@ -616,7 +616,7 @@ void FixDeformPressure::apply_volume()
int dynamic2 = set[i].dynamic2; int dynamic2 = set[i].dynamic2;
int fixed = set[i].fixed; int fixed = set[i].fixed;
double v0 = set[i].vol_start; double v0 = set[i].vol_start;
double shift; double shift = 0.0;
if (set[i].substyle == ONE_FROM_ONE) { if (set[i].substyle == ONE_FROM_ONE) {
shift = 0.5 * (v0 / (set[dynamic1].hi_target - set[dynamic1].lo_target) / shift = 0.5 * (v0 / (set[dynamic1].hi_target - set[dynamic1].lo_target) /
@ -862,8 +862,8 @@ void FixDeformPressure::options(int i, int narg, char **arg)
// parse only options not handled by parent class // parse only options not handled by parent class
int iarg, nskip; int iarg;
while (i < leftover_iarg.size()) { while (i < (int) leftover_iarg.size()) {
iarg = leftover_iarg[i]; iarg = leftover_iarg[i];
if (strcmp(arg[iarg], "couple") == 0) { if (strcmp(arg[iarg], "couple") == 0) {
if (iarg + 2 > narg) utils::missing_cmd_args(FLERR, "fix deform/pressure couple", error); if (iarg + 2 > narg) utils::missing_cmd_args(FLERR, "fix deform/pressure couple", error);

11
src/fix_deform.cpp
View File

@ -782,7 +782,7 @@ void FixDeform::apply_volume()
int dynamic2 = set[i].dynamic2; int dynamic2 = set[i].dynamic2;
int fixed = set[i].fixed; int fixed = set[i].fixed;
double v0 = set[i].vol_start; double v0 = set[i].vol_start;
double shift; double shift = 0.0;
if (set[i].substyle == ONE_FROM_ONE) { if (set[i].substyle == ONE_FROM_ONE) {
shift = 0.5 * (v0 / (set[dynamic1].hi_target - set[dynamic1].lo_target) / shift = 0.5 * (v0 / (set[dynamic1].hi_target - set[dynamic1].lo_target) /
@ -1002,11 +1002,8 @@ void FixDeform::options(int narg, char **arg)
// arguments for child classes // arguments for child classes
std::unordered_map<std::string, int> child_options; std::unordered_map<std::string, int> child_options;
int nskip;
if (utils::strmatch(style, "^deform/pressure")) { if (utils::strmatch(style, "^deform/pressure")) {
child_options.insert({{"couple", 2}, child_options.insert({{"couple", 2}, {"max/rate", 2}, {"normalize/pressure", 2},
{"max/rate", 2},
{"normalize/pressure", 2},
{"vol/balance/p", 2}}); {"vol/balance/p", 2}});
} }
@ -1033,10 +1030,10 @@ void FixDeform::options(int narg, char **arg)
flipflag = utils::logical(FLERR, arg[iarg + 1], false, lmp); flipflag = utils::logical(FLERR, arg[iarg + 1], false, lmp);
iarg += 2; iarg += 2;
} else if (child_options.find(arg[iarg]) != child_options.end()) { } else if (child_options.find(arg[iarg]) != child_options.end()) {
nskip = child_options[arg[iarg]]; auto nskip = child_options[arg[iarg]];
if (iarg + nskip > narg) if (iarg + nskip > narg)
utils::missing_cmd_args(FLERR, fmt::format("fix {} {}", style, arg[iarg]), error); utils::missing_cmd_args(FLERR, fmt::format("fix {} {}", style, arg[iarg]), error);
for (int i = 0; i < nskip; i++) leftover_iarg.push_back(iarg + i); for (int i = 0; i < nskip; i++) leftover_iarg.push_back(iarg + i);
iarg += nskip; iarg += nskip;
} else error->all(FLERR, "Unknown fix {} keyword: {}", style, arg[iarg]); } else error->all(FLERR, "Unknown fix {} keyword: {}", style, arg[iarg]);
} }