forked from lijiext/lammps
correct overlapping definitions of bitmask flags
This commit is contained in:
parent
1e3938835b
commit
493f1cf65b
|
@ -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;
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
namespace LAMMPS_NS {
|
||||
namespace RigidConst {
|
||||
|
||||
|
||||
enum{SINGLE,MOLECULE,GROUP};
|
||||
enum{NONE,XYZ,XY,YZ,XZ};
|
||||
enum{ISO,ANISO,TRICLINIC};
|
||||
|
|
Loading…
Reference in New Issue