fix logic bug

This commit is contained in:
Axel Kohlmeyer
2025-07-11 07:09:28 -04:00
parent 4ed5e585c1
commit 9b42419446

View File

@ -102,8 +102,9 @@ FixHMC::FixHMC(LAMMPS *lmp, int narg, char **arg) :
auto *ifix = modify->get_fix_by_id(id_rigid);
if (!ifix) error->all(FLERR, iarg + 1, "Unknown rigid fix id {} for fix hmc", id_rigid);
fix_rigid = dynamic_cast<FixRigidSmall *>(ifix);
if (!fix_rigid || !utils::strmatch(ifix->style, "^rigid/small") ||
!utils::strmatch(ifix->style, "^rigid/nve/small"))
if (!fix_rigid ||
(!utils::strmatch(ifix->style, "^rigid/small") &&
!utils::strmatch(ifix->style, "^rigid/nve/small")))
error->all(FLERR, Error::NOLASTLINE,
"Fix ID {} for fix hmc does not point to fix rigid/small or rigid/nve/small",
id_rigid);
@ -302,8 +303,9 @@ void FixHMC::init()
if (!ifix)
error->all(FLERR, Error::NOLASTLINE, "Unknown rigid fix id {} for fix hmc", id_rigid);
fix_rigid = dynamic_cast<FixRigidSmall *>(ifix);
if (!fix_rigid || !utils::strmatch(ifix->style, "^rigid/small") ||
!utils::strmatch(ifix->style, "^rigid/nve/small"))
if (!fix_rigid ||
(!utils::strmatch(ifix->style, "^rigid/small") &&
!utils::strmatch(ifix->style, "^rigid/nve/small")))
error->all(FLERR, Error::NOLASTLINE,
"Fix ID {} for fix hmc does not point to fix rigid/small or rigid/nve/small",
id_rigid);