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

This commit is contained in:
sjplimp
2013-02-14 15:29:39 +00:00
parent 2a614f4523
commit 41801fa762
5 changed files with 8 additions and 8 deletions

View File

@ -369,8 +369,8 @@ int AtomVecAngleCuda::pack_exchange(int dim, double *buf)
{ {
int dm= modify->fix[atom->extra_grow[iextra]]->pack_exchange(i,&buf_p[m]); int dm= modify->fix[atom->extra_grow[iextra]]->pack_exchange(i,&buf_p[m]);
m+=dm; m+=dm;
nextra+=dm; nextra+=dm;
if(i<nlocal)modify->fix[atom->extra_grow[iextra]]->copy_arrays(copylist[j],i,delflag); if(i<nlocal)modify->fix[atom->extra_grow[iextra]]->copy_arrays(copylist[j],i,1);
if(m>*maxsend) {grow_send(m,buf_pointer,1); buf_p=*buf_pointer;} if(m>*maxsend) {grow_send(m,buf_pointer,1); buf_p=*buf_pointer;}
} }

View File

@ -330,7 +330,7 @@ int AtomVecAtomicCuda::pack_exchange(int dim, double *buf)
int dm = modify->fix[atom->extra_grow[iextra]]->pack_exchange(i,&((*buf_pointer)[m])); int dm = modify->fix[atom->extra_grow[iextra]]->pack_exchange(i,&((*buf_pointer)[m]));
m+=dm; m+=dm;
nextra+=dm; nextra+=dm;
if(i<nlocal)modify->fix[atom->extra_grow[iextra]]->copy_arrays(copylist[j],i,delflag); if(i<nlocal)modify->fix[atom->extra_grow[iextra]]->copy_arrays(copylist[j],i,1);
if(m>*maxsend) grow_send(m,buf_pointer,1); if(m>*maxsend) grow_send(m,buf_pointer,1);
} }
(*buf_pointer)[j+1] = nextra; (*buf_pointer)[j+1] = nextra;

View File

@ -336,7 +336,7 @@ int AtomVecChargeCuda::pack_exchange(int dim, double *buf)
int dm = modify->fix[atom->extra_grow[iextra]]->pack_exchange(i,&((*buf_pointer)[m])); int dm = modify->fix[atom->extra_grow[iextra]]->pack_exchange(i,&((*buf_pointer)[m]));
m+=dm; m+=dm;
nextra+=dm; nextra+=dm;
if(i<nlocal)modify->fix[atom->extra_grow[iextra]]->copy_arrays(copylist[j],i,delflag); if(i<nlocal)modify->fix[atom->extra_grow[iextra]]->copy_arrays(copylist[j],i,1);
if(m>*maxsend) grow_send(m,buf_pointer,1); if(m>*maxsend) grow_send(m,buf_pointer,1);
} }
(*buf_pointer)[j+1] = nextra; (*buf_pointer)[j+1] = nextra;

View File

@ -60,8 +60,8 @@ using namespace LAMMPS_NS;
#define BUF_FLOAT double #define BUF_FLOAT double
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
AtomVecFullCuda::AtomVecFullCuda(LAMMPS *lmp, int narg, char **arg) : AtomVecFullCuda::AtomVecFullCuda(LAMMPS *lmp) :
AtomVecFull(lmp, narg, arg) AtomVecFull(lmp)
{ {
cuda = lmp->cuda; cuda = lmp->cuda;
if(cuda == NULL) if(cuda == NULL)
@ -393,7 +393,7 @@ int AtomVecFullCuda::pack_exchange(int dim, double *buf)
int dm= modify->fix[atom->extra_grow[iextra]]->pack_exchange(i,&buf_p[m]); int dm= modify->fix[atom->extra_grow[iextra]]->pack_exchange(i,&buf_p[m]);
m+=dm; m+=dm;
nextra+=dm; nextra+=dm;
if(i<nlocal)modify->fix[atom->extra_grow[iextra]]->copy_arrays(copylist[j],i,delflag); if(i<nlocal)modify->fix[atom->extra_grow[iextra]]->copy_arrays(copylist[j],i,1);
if(m>*maxsend) {grow_send(m,buf_pointer,1); buf_p=*buf_pointer;} if(m>*maxsend) {grow_send(m,buf_pointer,1); buf_p=*buf_pointer;}
} }

View File

@ -37,7 +37,7 @@ namespace LAMMPS_NS {
class AtomVecFullCuda : public AtomVecFull { class AtomVecFullCuda : public AtomVecFull {
public: public:
AtomVecFullCuda(class LAMMPS *, int, char **); AtomVecFullCuda(class LAMMPS *);
virtual ~AtomVecFullCuda() {} virtual ~AtomVecFullCuda() {}
void grow_copylist(int n); void grow_copylist(int n);
void grow_send(int n,double** buf_send,int flag); void grow_send(int n,double** buf_send,int flag);