diff --git a/src/OPENMP/fix_neigh_history_omp.cpp b/src/OPENMP/fix_neigh_history_omp.cpp index 90f0b6dced..4f8db143eb 100644 --- a/src/OPENMP/fix_neigh_history_omp.cpp +++ b/src/OPENMP/fix_neigh_history_omp.cpp @@ -32,15 +32,11 @@ using namespace LAMMPS_NS; using namespace FixConst; -enum{DEFAULT,NPARTNER,PERPARTNER}; // also set in fix neigh/history - FixNeighHistoryOMP::FixNeighHistoryOMP(class LAMMPS *lmp,int narg,char **argv) : FixNeighHistory(lmp,narg,argv) { - } - /* ---------------------------------------------------------------------- copy partner info from neighbor data structs (NDS) to atom arrays should be called whenever NDS store current history info diff --git a/src/fix_neigh_history.cpp b/src/fix_neigh_history.cpp index f22ce8f6b4..9c931ad0d1 100644 --- a/src/fix_neigh_history.cpp +++ b/src/fix_neigh_history.cpp @@ -30,8 +30,6 @@ using namespace LAMMPS_NS; using namespace FixConst; -enum{DEFAULT,NPARTNER,PERPARTNER}; // also set in fix neigh/history/omp - /* ---------------------------------------------------------------------- */ FixNeighHistory::FixNeighHistory(LAMMPS *lmp, int narg, char **arg) : diff --git a/src/fix_neigh_history.h b/src/fix_neigh_history.h index bd029ef529..628539e0e6 100644 --- a/src/fix_neigh_history.h +++ b/src/fix_neigh_history.h @@ -95,6 +95,8 @@ class FixNeighHistory : public Fix { // Shift by HISTBITS and check the first bit inline int histmask(int j) const { return j >> HISTBITS & 1; } + + enum { DEFAULT, NPARTNER, PERPARTNER }; }; } // namespace LAMMPS_NS