From 493f1cf65b3ea87c5b05d3a2c06af53bc2a4c228 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Mon, 9 Sep 2019 15:33:56 -0400 Subject: [PATCH] correct overlapping definitions of bitmask flags --- src/RIGID/fix_rigid_small.h | 3 --- src/RIGID/rigid_const.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/RIGID/fix_rigid_small.h b/src/RIGID/fix_rigid_small.h index 469616439c..0d1cdb5963 100644 --- a/src/RIGID/fix_rigid_small.h +++ b/src/RIGID/fix_rigid_small.h @@ -128,9 +128,6 @@ class FixRigidSmall : public Fix { int dorientflag; // 1 if particles store dipole orientation int reinitflag; // 1 if re-initialize rigid bodies between runs - int POINT,SPHERE,ELLIPSOID,LINE,TRIANGLE,DIPOLE; // bitmasks for eflags - int OMEGA,ANGMOM,TORQUE; - class AtomVecEllipsoid *avec_ellipsoid; class AtomVecLine *avec_line; class AtomVecTri *avec_tri; diff --git a/src/RIGID/rigid_const.h b/src/RIGID/rigid_const.h index 804cd9260a..14db517fcd 100644 --- a/src/RIGID/rigid_const.h +++ b/src/RIGID/rigid_const.h @@ -16,7 +16,7 @@ namespace LAMMPS_NS { namespace RigidConst { - + enum{SINGLE,MOLECULE,GROUP}; enum{NONE,XYZ,XY,YZ,XZ}; enum{ISO,ANISO,TRICLINIC};