From d72b390c41f63bae8f6cde7c9d4a56e6a9abf042 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 1 Apr 2021 08:48:39 -0400 Subject: [PATCH] correct check for box changing fixes --- src/RIGID/fix_rigid.cpp | 4 ++-- src/RIGID/fix_rigid_small.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/RIGID/fix_rigid.cpp b/src/RIGID/fix_rigid.cpp index 985554f738..26bbb9477f 100644 --- a/src/RIGID/fix_rigid.cpp +++ b/src/RIGID/fix_rigid.cpp @@ -725,7 +725,7 @@ void FixRigid::init() for (i = 0; i < modify->nfix; i++) if (modify->fix[i]->box_change) break; if (i < modify->nfix) { - for (int j = i; j < modify->nfix; j++) + for (int j = i+1; j < modify->nfix; j++) if (utils::strmatch(modify->fix[j]->style,"^rigid")) error->all(FLERR,"Rigid fixes must come before any box changing fix"); } @@ -736,7 +736,7 @@ void FixRigid::init() int ifix = modify->find_fix(id_gravity); if (ifix < 0) error->all(FLERR,"Fix rigid cannot find fix gravity ID"); if (!utils::strmatch(modify->fix[ifix]->style,"^gravity")) - error->all(FLERR,"Fix rigid gravity fix is invalid"); + error->all(FLERR,"Fix rigid gravity fix ID is not a gravity fix style"); int tmp; gvec = (double *) modify->fix[ifix]->extract("gvec",tmp); } diff --git a/src/RIGID/fix_rigid_small.cpp b/src/RIGID/fix_rigid_small.cpp index d9a0b82ae8..14bd9f7a55 100644 --- a/src/RIGID/fix_rigid_small.cpp +++ b/src/RIGID/fix_rigid_small.cpp @@ -576,7 +576,7 @@ void FixRigidSmall::init() for (i = 0; i < modify->nfix; i++) if (modify->fix[i]->box_change) break; if (i < modify->nfix) { - for (int j = i; j < modify->nfix; j++) + for (int j = i+1; j < modify->nfix; j++) if (utils::strmatch(modify->fix[j]->style,"^rigid")) error->all(FLERR,"Rigid fixes must come before any box changing fix"); } @@ -587,7 +587,7 @@ void FixRigidSmall::init() int ifix = modify->find_fix(id_gravity); if (ifix < 0) error->all(FLERR,"Fix rigid/small cannot find fix gravity ID"); if (!utils::strmatch(modify->fix[ifix]->style,"^gravity")) - error->all(FLERR,"Fix rigid/small gravity fix is invalid"); + error->all(FLERR,"Fix rigid gravity fix ID is not a gravity fix style"); int tmp; gvec = (double *) modify->fix[ifix]->extract("gvec",tmp); }