refactor constant vs define in edip pair styles

src/USER-MISC/pair_edip.cpp

@@ -46,7 +46,7 @@ using namespace LAMMPS_NS;
 
 // max number of interaction per atom for f(Z) environment potential
 
-#define leadDimInteractionList 64
+static constexpr int leadDimInteractionList = 64;
 
 /* ---------------------------------------------------------------------- */
 

src/USER-MISC/pair_edip_multi.cpp

@@ -32,13 +32,11 @@
 #include "error.h"
 #include "citeme.h"
 
-
 using namespace LAMMPS_NS;
 
 #define MAXLINE 1024
 #define DELTA 4
 
-
 static const char cite_pair_edip[] =
   "@article{cjiang2012\n"
   " author    = {Jian, Chao and Morgan, Dane, and Szlufarska, Izabella},\n"
@@ -56,7 +54,9 @@ static const char cite_pair_edip[] =
   " year      = {2010},\n"
   "}\n\n";
 
+// max number of interaction per atom for f(Z) environment potential
 
+static constexpr int leadDimInteractionList = 64;
 
 /* ---------------------------------------------------------------------- */
 
@@ -94,7 +94,6 @@ PairEDIPMulti::~PairEDIPMulti()
     memory->destroy(cutsq);
     delete [] map;
 
-//XXX    deallocateGrids();
     deallocatePreLoops();
   }
 }

src/USER-MISC/pair_edip_multi.h

@@ -62,10 +62,6 @@ class PairEDIPMulti : public Pair {
   int maxparam;                 // max # of parameter sets
   Param *params;                // parameter set for an I-J-K interaction
 
-  // max number of interaction per atom for f(Z) environment potential
-
-  static const int leadDimInteractionList = 64;
-
   void allocate();
   void allocatePreLoops(void);
   void deallocatePreLoops(void);

src/USER-OMP/pair_edip_omp.cpp

@@ -28,7 +28,7 @@ using namespace LAMMPS_NS;
 
 // max number of interaction per atom for f(Z) environment potential
 
-#define leadDimInteractionList 64
+static constexpr int leadDimInteractionList = 64;
 
 /* ---------------------------------------------------------------------- */