ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consolidate enum into header file

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-04-21 12:23:03 -04:00
parent 2197d62c2f
commit 8cfac6fd60
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OPENMP/fix_neigh_history_omp.cpp
View File

@ -32,15 +32,11 @@
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
using namespace FixConst; using namespace FixConst;
enum{DEFAULT,NPARTNER,PERPARTNER}; // also set in fix neigh/history
FixNeighHistoryOMP::FixNeighHistoryOMP(class LAMMPS *lmp,int narg,char **argv) FixNeighHistoryOMP::FixNeighHistoryOMP(class LAMMPS *lmp,int narg,char **argv)
: FixNeighHistory(lmp,narg,argv) { : FixNeighHistory(lmp,narg,argv) {
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
copy partner info from neighbor data structs (NDS) to atom arrays copy partner info from neighbor data structs (NDS) to atom arrays
should be called whenever NDS store current history info should be called whenever NDS store current history info

2
src/fix_neigh_history.cpp
View File

@ -30,8 +30,6 @@
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
using namespace FixConst; using namespace FixConst;
enum{DEFAULT,NPARTNER,PERPARTNER}; // also set in fix neigh/history/omp
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
FixNeighHistory::FixNeighHistory(LAMMPS *lmp, int narg, char **arg) : FixNeighHistory::FixNeighHistory(LAMMPS *lmp, int narg, char **arg) :

2
src/fix_neigh_history.h
View File

@ -95,6 +95,8 @@ class FixNeighHistory : public Fix {
// Shift by HISTBITS and check the first bit // Shift by HISTBITS and check the first bit
inline int histmask(int j) const { return j >> HISTBITS & 1; } inline int histmask(int j) const { return j >> HISTBITS & 1; }
enum { DEFAULT, NPARTNER, PERPARTNER };
}; };
} // namespace LAMMPS_NS } // namespace LAMMPS_NS