Updating naming in other classes

src/comm.cpp

@@ -76,7 +76,7 @@ Comm::Comm(LAMMPS *lmp) : Pointers(lmp)
   grid2proc = nullptr;
   xsplit = ysplit = zsplit = nullptr;
   rcbnew = 0;
-  multi2 = 0;
+  multi_reduce = 0;
 
   // use of OpenMP threads
   // query OpenMP for number of threads/process set by user at run-time
@@ -242,15 +242,15 @@ void Comm::init()
   for (int i = 0; i < nfix; i++)
     if (fix[i]->maxexchange_dynamic) maxexchange_fix_dynamic = 1;
 
-  // Can't used multi2 communication with Newton off
+  // Can't used multi_reduce communication with Newton off
   // TODO: need to somehow restrict this option with full neighbor lists
-  // CANNOT use multi2 communication with full nlist 
+  // CANNOT use multi_reduce communication with full nlist 
-  // Could remove NP_NEWTON from npair_full_*multi2*, but could be cryptic
+  // Could remove NP_NEWTON from npair_full_*multi_reduce*, but could be cryptic
-  // Also could be cases where you want newton off (hybrid) but don't use multi2 comm
+  // Also could be cases where you want newton off (hybrid) but don't use multi_reduce comm
-  // Could add check on neighbor build, if full and comm->multi2 error...
+  // Could add check on neighbor build, if full and comm->multi_reduce error...
   // or just add check on comm setup - is that run before every run? Only if box change...
-  if (force->newton == 0 && multi2)
+  if (force->newton == 0 && multi_reduce)
-    error->all(FLERR,"Cannot use multi2 communication with Newton off");
+    error->all(FLERR,"Cannot use multi/reduce communication with Newton off");
 }
 
 /* ----------------------------------------------------------------------
@@ -337,10 +337,10 @@ void Comm::modify_params(int narg, char **arg)
       for (i=nlo; i<=nhi; ++i)
         cutusermulti[i] = cut;
       iarg += 3;
-    } else if (strcmp(arg[iarg],"cutoff/multi2") == 0) {
+    } else if (strcmp(arg[iarg],"multi/reduce") == 0) {
       if (mode == Comm::SINGLE)
-        error->all(FLERR,"Use cutoff/multi2 in mode multi only");
+        error->all(FLERR,"Use multi/reduce in mode multi only");
-      multi2 = 1;
+      multi_reduce = 1;
       iarg += 1;
     } else if (strcmp(arg[iarg],"vel") == 0) {
       if (iarg+2 > narg) error->all(FLERR,"Illegal comm_modify command");

src/comm.h

@@ -152,7 +152,7 @@ class Comm : protected Pointers {
   int ncores;                       // # of cores per node
   int coregrid[3];                  // 3d grid of cores within a node
   int user_coregrid[3];             // user request for cores in each dim
-  int multi2;                        // 1 if multi cutoff is intra-type cutoff
+  int multi_reduce;                 // 1 if multi cutoff is intra-type cutoff
 
   void init_exchange();
   int rendezvous_irregular(int, char *, int, int, int *,

src/comm_brick.cpp

@@ -174,8 +174,8 @@ void CommBrick::setup()
     cutghost[0] = cutghost[1] = cutghost[2] = cut;
 
     if (mode == Comm::MULTI) {
-      if (multi2) {
+      if (multi_reduce) {
-        // If using multi2 binlists, communicate itype particles a distance
+        // If using multi/reduce binlists, communicate itype particles a distance
         // equal to the max of itype-jtype interaction given smaller jtype particles 
         double **cutneighsq = neighbor->cutneighsq;
         double *cuttypesq = neighbor->cuttypesq;
@@ -225,8 +225,8 @@ void CommBrick::setup()
     cutghost[2] = cut * length2;
 
     if (mode == Comm::MULTI) {
-      if (multi2) {
+      if (multi_reduce) {
-        // If using multi2 binlists, communicate itype particles a distance
+        // If using multi/reduce binlists, communicate itype particles a distance
         // equal to the max of itype-jtype interaction given smaller jtype particles 
         double **cutneighsq = neighbor->cutneighsq;
         double *cuttypesq = neighbor->cuttypesq;

src/comm_tiled.cpp

@@ -176,8 +176,8 @@ void CommTiled::setup()
 
   if (mode == Comm::MULTI) {
     double cut;
-    if (multi2) {
+    if (multi_reduce) {
-        // If using multi2 binlists, communicate itype particles a distance
+        // If using multi/reduce binlists, communicate itype particles a distance
         // equal to the max of itype-jtype interaction given smaller jtype particles 
         double **cutneighsq = neighbor->cutneighsq;
         double *cuttypesq = neighbor->cuttypesq;

src/neighbor.cpp

@@ -1640,7 +1640,7 @@ int Neighbor::choose_bin(NeighRequest *rq)
     if (!rq->kokkos_device != !(mask & NB_KOKKOS_DEVICE)) continue;
     if (!rq->kokkos_host != !(mask & NB_KOKKOS_HOST)) continue;
 
-    // neighbor style is BIN or MULTI or MULTI2 and must match
+    // neighbor style is BIN or MULTI or MULTI_OLD and must match
 
     if (style == Neighbor::BIN || style == Neighbor::MULTI_OLD) {
       if (!(mask & NB_STANDARD)) continue;