From 4d53daece8967b8cb2d0f1be33b0306c7d89e414 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Fri, 20 May 2011 16:00:29 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6171 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/comm.cpp | 2 +- src/comm.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/comm.cpp b/src/comm.cpp index e97d3f3474..c8c06bbf16 100644 --- a/src/comm.cpp +++ b/src/comm.cpp @@ -400,7 +400,7 @@ void Comm::setup() other per-atom attributes may also be sent via pack/unpack routines ------------------------------------------------------------------------- */ -void Comm::forward_comm() +void Comm::forward_comm(int dummy) { int n; MPI_Request request; diff --git a/src/comm.h b/src/comm.h index 11b7e28b8a..d6934775bf 100644 --- a/src/comm.h +++ b/src/comm.h @@ -35,12 +35,12 @@ class Comm : protected Pointers { int ***grid2proc; // which proc owns i,j,k loc in 3d grid Comm(class LAMMPS *); - ~Comm(); + virtual ~Comm(); void init(); void set_procs(); // setup 3d grid of procs void setup(); // setup 3d communication pattern - void forward_comm(); // forward communication of atom coords + void forward_comm(int dummy = 0); // forward communication of atom coords void reverse_comm(); // reverse communication of forces void exchange(); // move atoms to new procs void borders(); // setup list of atoms to communicate @@ -55,7 +55,7 @@ class Comm : protected Pointers { void set(int, char **); // set communication style bigint memory_usage(); - private: + protected: int style; // single vs multi-type comm int nswap; // # of swaps to perform int need[3]; // procs I need atoms from in each dim