force enumerators to be consistent by moving them to base class declaration
This commit is contained in:
@ -41,8 +41,6 @@ using namespace LAMMPS_NS;
|
||||
using namespace FixConst;
|
||||
using namespace MathConst;
|
||||
|
||||
enum{NONE=0,FINAL,DELTA,SCALE,VEL,ERATE,TRATE,VOLUME,WIGGLE,VARIABLE,PRESSURE,PMEAN};
|
||||
enum{ONE_FROM_ONE,ONE_FROM_TWO,TWO_FROM_ONE};
|
||||
enum{ NOCOUPLE=0, XYZ, XY, YZ, XZ };
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
@ -41,9 +41,6 @@ using namespace LAMMPS_NS;
|
||||
using namespace FixConst;
|
||||
using namespace MathConst;
|
||||
|
||||
enum{NONE=0,FINAL,DELTA,SCALE,VEL,ERATE,TRATE,VOLUME,WIGGLE,VARIABLE};
|
||||
enum{ONE_FROM_ONE,ONE_FROM_TWO,TWO_FROM_ONE};
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
FixDeform::FixDeform(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg),
|
||||
|
||||
@ -29,6 +29,9 @@ class FixDeform : public Fix {
|
||||
int remapflag; // whether x,v are remapped across PBC
|
||||
int dimflag[6]; // which dims are deformed
|
||||
|
||||
enum { NONE, FINAL, DELTA, SCALE, VEL, ERATE, TRATE, VOLUME, WIGGLE, VARIABLE, PRESSURE, PMEAN };
|
||||
enum { ONE_FROM_ONE, ONE_FROM_TWO, TWO_FROM_ONE };
|
||||
|
||||
FixDeform(class LAMMPS *, int, char **);
|
||||
~FixDeform() override;
|
||||
int setmask() override;
|
||||
|
||||
Reference in New Issue
Block a user