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

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12257 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2014-08-06 16:47:29 +00:00
parent 6bd64d5aab
commit d0a2f7f57a
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/USER-ATC/fix_atc.cpp
View File

@ -679,7 +679,8 @@ int FixATC::unpack_exchange(int nlocal, double * buf)
return num; return num;
} }
int FixATC::pack_forward_comm(int n, int *list, double *buf, int pbc_flag, int *pbc) int FixATC::pack_forward_comm(int n, int *list, double *buf,
int pbc_flag, int *pbc)
{ {
int num = atc_->pack_comm(n, list, buf, pbc_flag, pbc); int num = atc_->pack_comm(n, list, buf, pbc_flag, pbc);
return num; return num;
@ -690,7 +691,6 @@ void FixATC::unpack_forward_comm(int n, int first, double *buf)
atc_->unpack_comm(n, first, buf); atc_->unpack_comm(n, first, buf);
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
pack values in local atom-based arrays for restart file pack values in local atom-based arrays for restart file
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */

6
src/comm_tiled.cpp
View File

@ -1269,8 +1269,6 @@ void CommTiled::borders()
*/ */
} }
// NOTE: remaining forward/reverse methods still need to be updated
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
forward communication invoked by a Pair forward communication invoked by a Pair
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
@ -1456,6 +1454,8 @@ void CommTiled::reverse_comm_fix(Fix *fix)
} }
} }
// NOTE: these two forward/reverse methods still need to be updated
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
forward communication invoked by a Fix forward communication invoked by a Fix
n = total datums for all atoms, allows for variable number/atom n = total datums for all atoms, allows for variable number/atom
@ -1727,6 +1727,8 @@ void CommTiled::forward_comm_array(int nsize, double **array)
} }
} }
// NOTE: this one is not used ???
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
exchange info provided with all 6 stencil neighbors exchange info provided with all 6 stencil neighbors
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */

6
src/comm_tiled.h
View File

@ -65,8 +65,8 @@ class CommTiled : public Comm {
int **sendnum,**recvnum; // # of atoms to send/recv per swap/proc int **sendnum,**recvnum; // # of atoms to send/recv per swap/proc
int **size_forward_recv; // # of values to recv in each forward swap/proc int **size_forward_recv; // # of values to recv in each forward swap/proc
int **firstrecv; // where to put 1st recv atom per swap/proc int **firstrecv; // where to put 1st recv atom per swap/proc
int **size_reverse_send; // # to send in each reverse comm per swap/proc int **size_reverse_send; // # of values to send in each reverse swap/proc
int **size_reverse_recv; // # to recv in each reverse comm per swap/proc int **size_reverse_recv; // # of values to recv in each reverse swap/proc
int **forward_recv_offset; // forward comm offsets in buf_recv per swap/proc int **forward_recv_offset; // forward comm offsets in buf_recv per swap/proc
int **reverse_recv_offset; // reverse comm offsets in buf_recv per swap/proc int **reverse_recv_offset; // reverse comm offsets in buf_recv per swap/proc
@ -82,7 +82,7 @@ class CommTiled : public Comm {
int *nexchproc; // # of procs to send/recv to/from in each exch int *nexchproc; // # of procs to send/recv to/from in each exch
int *nexchprocmax; // current max # of exch procs for each exch int *nexchprocmax; // current max # of exch procs for each exch
int **exchproc; // procs to exchange with per exch int **exchproc; // procs to exchange with per exch
int **exchnum; // # of atoms received per exch/proc int **exchnum; // # of values received per exch/proc
double *buf_send; // send buffer for all comm double *buf_send; // send buffer for all comm
double *buf_recv; // recv buffer for all comm double *buf_recv; // recv buffer for all comm