git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12253 f3b2605a-…

…c512-4ea7-a41b-209d697bcdaa
lammps · Aug 6, 2014 · 2cca373 · 2cca373
1 parent a9495cb
commit 2cca373
Show file tree

Hide file tree

Showing 66 changed files with 306 additions and 268 deletions.
diff --git a/src/FLD/pair_lubricate.cpp b/src/FLD/pair_lubricate.cpp
@@ -752,8 +752,8 @@ void PairLubricate::read_restart_settings(FILE *fp)
 
 /* ---------------------------------------------------------------------- */
 
-int PairLubricate::pack_comm(int n, int *list, double *buf,
-                             int pbc_flag, int *pbc)
+int PairLubricate::pack_forward_comm(int n, int *list, double *buf,
+                                     int pbc_flag, int *pbc)
 {
   int i,j,m;
 
@@ -771,12 +771,12 @@ int PairLubricate::pack_comm(int n, int *list, double *buf,
     buf[m++] = omega[j][2];
   }
 
-  return 6;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */
 
-void PairLubricate::unpack_comm(int n, int first, double *buf)
+void PairLubricate::unpack_forward_comm(int n, int first, double *buf)
 {
   int i,m,last;
 

diff --git a/src/FLD/pair_lubricate.h b/src/FLD/pair_lubricate.h
@@ -40,8 +40,8 @@ class PairLubricate : public Pair {
   int pre_adapt(char *, int, int, int, int);
   void adapt(int, int, int, int, int, double);
 
-  int pack_comm(int, int *, double *, int, int *);
-  void unpack_comm(int, int, double *);
+  int pack_forward_comm(int, int *, double *, int, int *);
+  void unpack_forward_comm(int, int, double *);
 
  protected:
   double mu,cut_inner_global,cut_global;

diff --git a/src/FLD/pair_lubricateU.cpp b/src/FLD/pair_lubricateU.cpp
@@ -2009,8 +2009,8 @@ void PairLubricateU::copy_uo_vec(int inum, double **f, double **torque,
 
 /* ---------------------------------------------------------------------- */
 
-int PairLubricateU::pack_comm(int n, int *list, double *buf,
-                              int pbc_flag, int *pbc)
+int PairLubricateU::pack_forward_comm(int n, int *list, double *buf,
+                                      int pbc_flag, int *pbc)
 {
   int i,j,m;
 
@@ -2027,12 +2027,12 @@ int PairLubricateU::pack_comm(int n, int *list, double *buf,
     buf[m++] = omega[j][1];
     buf[m++] = omega[j][2];
   }
-  return 6;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */
 
-void PairLubricateU::unpack_comm(int n, int first, double *buf)
+void PairLubricateU::unpack_forward_comm(int n, int first, double *buf)
 {
   int i,m,last;
 

diff --git a/src/FLD/pair_lubricateU.h b/src/FLD/pair_lubricateU.h
@@ -37,8 +37,8 @@ class PairLubricateU : public Pair {
   void read_restart(FILE *);
   void write_restart_settings(FILE *);
   void read_restart_settings(FILE *);
-  int pack_comm(int, int *, double *, int, int *);
-  void unpack_comm(int, int, double *);
+  int pack_forward_comm(int, int *, double *, int, int *);
+  void unpack_forward_comm(int, int, double *);
 
  protected:
   double cut_inner_global,cut_global;

diff --git a/src/GPU/pair_eam_gpu.cpp b/src/GPU/pair_eam_gpu.cpp
@@ -237,8 +237,8 @@ double PairEAMGPU::single(int i, int j, int itype, int jtype,
 
 /* ---------------------------------------------------------------------- */
 
-int PairEAMGPU::pack_comm(int n, int *list, double *buf, int pbc_flag,
-                          int *pbc)
+int PairEAMGPU::pack_forward_comm(int n, int *list, double *buf, 
+                                  int pbc_flag,int *pbc)
 {
   int i,j,m;
 
@@ -258,12 +258,12 @@ int PairEAMGPU::pack_comm(int n, int *list, double *buf, int pbc_flag,
     }
   }
 
-  return 1;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */
 
-void PairEAMGPU::unpack_comm(int n, int first, double *buf)
+void PairEAMGPU::unpack_forward_comm(int n, int first, double *buf)
 {
   int i,m,last;
 

diff --git a/src/GPU/pair_eam_gpu.h b/src/GPU/pair_eam_gpu.h
@@ -35,8 +35,8 @@ class PairEAMGPU : public PairEAM {
   double single(int, int, int, int, double, double, double, double &);
   double memory_usage();
 
-  int pack_comm(int, int *, double *, int, int *);
-  void unpack_comm(int, int, double *);
+  int pack_forward_comm(int, int *, double *, int, int *);
+  void unpack_forward_comm(int, int, double *);
 
  enum { GPU_FORCE, GPU_NEIGH, GPU_HYB_NEIGH };
 

diff --git a/src/GRANULAR/pair_gran_hooke_history.cpp b/src/GRANULAR/pair_gran_hooke_history.cpp
@@ -763,8 +763,8 @@ double PairGranHookeHistory::single(int i, int j, int itype, int jtype,
 
 /* ---------------------------------------------------------------------- */
 
-int PairGranHookeHistory::pack_comm(int n, int *list,
-                                    double *buf, int pbc_flag, int *pbc)
+int PairGranHookeHistory::pack_forward_comm(int n, int *list, double *buf, 
+                                            int pbc_flag, int *pbc)
 {
   int i,j,m;
 
@@ -773,12 +773,12 @@ int PairGranHookeHistory::pack_comm(int n, int *list,
     j = list[i];
     buf[m++] = mass_rigid[j];
   }
-  return 1;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */
 
-void PairGranHookeHistory::unpack_comm(int n, int first, double *buf)
+void PairGranHookeHistory::unpack_forward_comm(int n, int first, double *buf)
 {
   int i,m,last;
 

diff --git a/src/GRANULAR/pair_gran_hooke_history.h b/src/GRANULAR/pair_gran_hooke_history.h
@@ -42,8 +42,8 @@ class PairGranHookeHistory : public Pair {
   void read_restart_settings(FILE *);
   void reset_dt();
   virtual double single(int, int, int, int, double, double, double, double &);
-  int pack_comm(int, int *, double *, int, int *);
-  void unpack_comm(int, int, double *);
+  int pack_forward_comm(int, int *, double *, int, int *);
+  void unpack_forward_comm(int, int, double *);
   void *extract(const char *, int &);
   double memory_usage();
 

diff --git a/src/MANYBODY/fix_qeq_comb.cpp b/src/MANYBODY/fix_qeq_comb.cpp
@@ -292,7 +292,8 @@ double FixQEQComb::memory_usage()
 }
 /* ---------------------------------------------------------------------- */
 
-int FixQEQComb::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
+int FixQEQComb::pack_forward_comm(int n, int *list, double *buf, 
+                                  int pbc_flag, int *pbc)
 {
   int i,j,m;
 
@@ -301,12 +302,12 @@ int FixQEQComb::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
     j = list[i];
     buf[m++] = atom->q[j];
   }
-  return 1;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */
 
-void FixQEQComb::unpack_comm(int n, int first, double *buf)
+void FixQEQComb::unpack_forward_comm(int n, int first, double *buf)
 {
   int i,m,last;
 

diff --git a/src/MANYBODY/fix_qeq_comb.h b/src/MANYBODY/fix_qeq_comb.h
@@ -35,8 +35,8 @@ class FixQEQComb : public Fix {
   virtual void post_force(int);
   void post_force_respa(int,int,int);
   double memory_usage();
-  int pack_comm(int , int *, double *, int, int *);
-  void unpack_comm(int , int , double *);
+  int pack_forward_comm(int , int *, double *, int, int *);
+  void unpack_forward_comm(int , int , double *);
 
   void min_post_force(int);
 

diff --git a/src/MANYBODY/pair_adp.cpp b/src/MANYBODY/pair_adp.cpp
@@ -933,7 +933,8 @@ void PairADP::grab(FILE *fp, int n, double *list)
 
 /* ---------------------------------------------------------------------- */
 
-int PairADP::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
+int PairADP::pack_forward_comm(int n, int *list, double *buf, 
+                               int pbc_flag, int *pbc)
 {
   int i,j,m;
 
@@ -951,12 +952,12 @@ int PairADP::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
     buf[m++] = lambda[j][4];
     buf[m++] = lambda[j][5];
   }
-  return 10;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */
 
-void PairADP::unpack_comm(int n, int first, double *buf)
+void PairADP::unpack_forward_comm(int n, int first, double *buf)
 {
   int i,m,last;
 
@@ -996,7 +997,7 @@ int PairADP::pack_reverse_comm(int n, int first, double *buf)
   buf[m++] = lambda[i][4];
   buf[m++] = lambda[i][5];
   }
-  return 10;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */

diff --git a/src/MANYBODY/pair_adp.h b/src/MANYBODY/pair_adp.h
@@ -34,8 +34,8 @@ class PairADP : public Pair {
   void init_style();
   double init_one(int, int);
 
-  int pack_comm(int, int *, double *, int, int *);
-  void unpack_comm(int, int, double *);
+  int pack_forward_comm(int, int *, double *, int, int *);
+  void unpack_forward_comm(int, int, double *);
   int pack_reverse_comm(int, int, double *);
   void unpack_reverse_comm(int, int *, double *);
   double memory_usage();

diff --git a/src/MANYBODY/pair_comb.cpp b/src/MANYBODY/pair_comb.cpp
@@ -1991,7 +1991,8 @@ void PairComb::Over_cor(Param *param, double rsq1, int NCoi,
 
 /* ---------------------------------------------------------------------- */
 
-int PairComb::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
+int PairComb::pack_forward_comm(int n, int *list, double *buf, 
+                                int pbc_flag, int *pbc)
 {
   int i,j,m;
 
@@ -2000,12 +2001,12 @@ int PairComb::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
     j = list[i];
     buf[m++] = qf[j];
   }
-  return 1;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */
 
-void PairComb::unpack_comm(int n, int first, double *buf)
+void PairComb::unpack_forward_comm(int n, int first, double *buf)
 {
   int i,m,last;
 
@@ -2023,7 +2024,7 @@ int PairComb::pack_reverse_comm(int n, int first, double *buf)
   m = 0;
   last = first + n;
   for (i = first; i < last; i++) buf[m++] = qf[i];
-  return 1;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */

diff --git a/src/MANYBODY/pair_comb.h b/src/MANYBODY/pair_comb.h
@@ -149,8 +149,8 @@ class PairComb : public Pair {
   void Over_cor(Param *, double, int, double &, double &);
   int pack_reverse_comm(int, int, double *);
   void unpack_reverse_comm(int, int *, double *);
-  int pack_comm(int , int *, double *, int, int *);
-  void unpack_comm(int , int , double *);
+  int pack_forward_comm(int , int *, double *, int, int *);
+  void unpack_forward_comm(int , int , double *);
 
   void Short_neigh();
 

diff --git a/src/MANYBODY/pair_comb3.cpp b/src/MANYBODY/pair_comb3.cpp
@@ -3853,7 +3853,8 @@ double PairComb3::switching_d(double rr)
 
 /* ---------------------------------------------------------------------- */
 
-int PairComb3::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
+int PairComb3::pack_forward_comm(int n, int *list, double *buf, 
+                                 int pbc_flag, int *pbc)
 {
   int i,j,m;
 
@@ -3869,12 +3870,12 @@ int PairComb3::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
       buf[m++] = NCo[j];
     }
   }
-  return 1;
+  return m;
 }   
 
 /* ---------------------------------------------------------------------- */
 
-void PairComb3::unpack_comm(int n, int first, double *buf)
+void PairComb3::unpack_forward_comm(int n, int first, double *buf)
 {   
   int i,m,last;
 
@@ -3904,7 +3905,7 @@ int PairComb3::pack_reverse_comm(int n, int first, double *buf)
     for (i = first; i < last; i++)
       buf[m++] = NCo[i];
   }
-  return 1;
+  return m;
 }   
 
 /* ---------------------------------------------------------------------- */

diff --git a/src/MANYBODY/pair_comb3.h b/src/MANYBODY/pair_comb3.h
@@ -246,8 +246,8 @@ class PairComb3 : public Pair {
   // communication functions
   int pack_reverse_comm(int, int, double *);
   void unpack_reverse_comm(int, int *, double *);
-  int pack_comm(int , int *, double *, int, int *);
-  void unpack_comm(int , int , double *);
+  int pack_forward_comm(int , int *, double *, int, int *);
+  void unpack_forward_comm(int , int , double *);
 
   // vector functions, inline for efficiency
   inline double vec3_dot(double *x, double *y) {

diff --git a/src/MANYBODY/pair_eam.cpp b/src/MANYBODY/pair_eam.cpp
@@ -806,7 +806,8 @@ double PairEAM::single(int i, int j, int itype, int jtype,
 
 /* ---------------------------------------------------------------------- */
 
-int PairEAM::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
+int PairEAM::pack_forward_comm(int n, int *list, double *buf, 
+                               int pbc_flag, int *pbc)
 {
   int i,j,m;
 
@@ -815,12 +816,12 @@ int PairEAM::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
     j = list[i];
     buf[m++] = fp[j];
   }
-  return 1;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */
 
-void PairEAM::unpack_comm(int n, int first, double *buf)
+void PairEAM::unpack_forward_comm(int n, int first, double *buf)
 {
   int i,m,last;
 
@@ -838,7 +839,7 @@ int PairEAM::pack_reverse_comm(int n, int first, double *buf)
   m = 0;
   last = first + n;
   for (i = first; i < last; i++) buf[m++] = rho[i];
-  return 1;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */

diff --git a/src/MANYBODY/pair_eam.h b/src/MANYBODY/pair_eam.h
@@ -53,8 +53,8 @@ class PairEAM : public Pair {
   double init_one(int, int);
   double single(int, int, int, int, double, double, double, double &);
 
-  virtual int pack_comm(int, int *, double *, int, int *);
-  virtual void unpack_comm(int, int, double *);
+  virtual int pack_forward_comm(int, int *, double *, int, int *);
+  virtual void unpack_forward_comm(int, int, double *);
   int pack_reverse_comm(int, int, double *);
   void unpack_reverse_comm(int, int *, double *);
   double memory_usage();

diff --git a/src/MANYBODY/pair_eim.cpp b/src/MANYBODY/pair_eim.cpp
@@ -1083,7 +1083,8 @@ double PairEIM::funccoul(int i, int j, double r)
 
 /* ---------------------------------------------------------------------- */
 
-int PairEIM::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
+int PairEIM::pack_forward_comm(int n, int *list, double *buf, 
+                               int pbc_flag, int *pbc)
 {
   int i,j,m;
 
@@ -1100,12 +1101,12 @@ int PairEIM::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
       buf[m++] = fp[j];
     }
   }
-  return 1;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */
 
-void PairEIM::unpack_comm(int n, int first, double *buf)
+void PairEIM::unpack_forward_comm(int n, int first, double *buf)
 {
   int i,m,last;
 
@@ -1133,7 +1134,7 @@ int PairEIM::pack_reverse_comm(int n, int first, double *buf)
   if (rhofp == 2) {
     for (i = first; i < last; i++) buf[m++] = fp[i];
   }
-  return 1;
+  return m;
 }
 
 /* ---------------------------------------------------------------------- */