Commit 55e8b2be authored by sjplimp's avatar sjplimp
Browse files 

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

src/STUBS/mpi.cpp

+9 −9
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int MPI_Type_size(MPI_Datatype datatype, int *size) 
  else if (datatype == MPI_DOUBLE) *size = sizeof(double);

  else if (datatype == MPI_CHAR) *size = sizeof(char);

  else if (datatype == MPI_BYTE) *size = sizeof(char);

  else if (datatype == MPI_UNSIGNED_LONG) *size = sizeof(uint64_t);

  else if (datatype == MPI_UNSIGNED_LONG_LONG) *size = sizeof(uint64_t);

  else if (datatype == MPI_DOUBLE_INT) *size = sizeof(double_int);

}
@@ -261,7 +261,7 @@ int MPI_Allreduce(void *sendbuf, void *recvbuf, int count, 
  else if (datatype == MPI_DOUBLE) n = count*sizeof(double);

  else if (datatype == MPI_CHAR) n = count*sizeof(char);

  else if (datatype == MPI_BYTE) n = count*sizeof(char);

  else if (datatype == MPI_UNSIGNED_LONG) n = count*sizeof(uint64_t);

  else if (datatype == MPI_UNSIGNED_LONG_LONG) n = count*sizeof(uint64_t);

  else if (datatype == MPI_DOUBLE_INT) n = count*sizeof(double_int);



  memcpy(recvbuf,sendbuf,n);
@@ -282,7 +282,7 @@ int MPI_Reduce(void *sendbuf, void *recvbuf, int count, 
  else if (datatype == MPI_DOUBLE) n = count*sizeof(double);

  else if (datatype == MPI_CHAR) n = count*sizeof(char);

  else if (datatype == MPI_BYTE) n = count*sizeof(char);

  else if (datatype == MPI_UNSIGNED_LONG) n = count*sizeof(uint64_t);

  else if (datatype == MPI_UNSIGNED_LONG_LONG) n = count*sizeof(uint64_t);

  else if (datatype == MPI_DOUBLE_INT) n = count*sizeof(double_int);



  memcpy(recvbuf,sendbuf,n);
@@ -301,7 +301,7 @@ int MPI_Scan(void *sendbuf, void *recvbuf, int count, 
  else if (datatype == MPI_DOUBLE) n = count*sizeof(double);

  else if (datatype == MPI_CHAR) n = count*sizeof(char);

  else if (datatype == MPI_BYTE) n = count*sizeof(char);

  else if (datatype == MPI_UNSIGNED_LONG) n = count*sizeof(uint64_t);

  else if (datatype == MPI_UNSIGNED_LONG_LONG) n = count*sizeof(uint64_t);

  else if (datatype == MPI_DOUBLE_INT) n = count*sizeof(double_int);



  memcpy(recvbuf,sendbuf,n);
@@ -322,7 +322,7 @@ int MPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, 
  else if (sendtype == MPI_DOUBLE) n = sendcount*sizeof(double);

  else if (sendtype == MPI_CHAR) n = sendcount*sizeof(char);

  else if (sendtype == MPI_BYTE) n = sendcount*sizeof(char);

  else if (sendtype == MPI_UNSIGNED_LONG) n = sendcount*sizeof(uint64_t);

  else if (sendtype == MPI_UNSIGNED_LONG_LONG) n = sendcount*sizeof(uint64_t);

  else if (sendtype == MPI_DOUBLE_INT) n = sendcount*sizeof(double_int);



  memcpy(recvbuf,sendbuf,n);
@@ -343,7 +343,7 @@ int MPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, 
  else if (sendtype == MPI_DOUBLE) n = sendcount*sizeof(double);

  else if (sendtype == MPI_CHAR) n = sendcount*sizeof(char);

  else if (sendtype == MPI_BYTE) n = sendcount*sizeof(char);

  else if (sendtype == MPI_UNSIGNED_LONG) n = sendcount*sizeof(uint64_t);

  else if (sendtype == MPI_UNSIGNED_LONG_LONG) n = sendcount*sizeof(uint64_t);

  else if (sendtype == MPI_DOUBLE_INT) n = sendcount*sizeof(double_int);



  memcpy(recvbuf,sendbuf,n);
@@ -363,7 +363,7 @@ int MPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, 
  else if (datatype == MPI_DOUBLE) n = *recvcounts*sizeof(double);

  else if (datatype == MPI_CHAR) n = *recvcounts*sizeof(char);

  else if (datatype == MPI_BYTE) n = *recvcounts*sizeof(char);

  else if (datatype == MPI_UNSIGNED_LONG) n = *recvcounts*sizeof(uint64_t);

  else if (datatype == MPI_UNSIGNED_LONG_LONG) n = *recvcounts*sizeof(uint64_t);

  else if (datatype == MPI_DOUBLE_INT) n = *recvcounts*sizeof(double_int);



  memcpy(recvbuf,sendbuf,n);
@@ -384,7 +384,7 @@ int MPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, 
  else if (sendtype == MPI_DOUBLE) n = sendcount*sizeof(double);

  else if (sendtype == MPI_CHAR) n = sendcount*sizeof(char);

  else if (sendtype == MPI_BYTE) n = sendcount*sizeof(char);

  else if (sendtype == MPI_UNSIGNED_LONG) n = sendcount*sizeof(uint64_t);

  else if (sendtype == MPI_UNSIGNED_LONG_LONG) n = sendcount*sizeof(uint64_t);

  else if (sendtype == MPI_DOUBLE_INT) n = sendcount*sizeof(double_int);



  memcpy(recvbuf,sendbuf,n);
@@ -405,7 +405,7 @@ int MPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, 
  else if (sendtype == MPI_DOUBLE) n = sendcount*sizeof(double);

  else if (sendtype == MPI_CHAR) n = sendcount*sizeof(char);

  else if (sendtype == MPI_BYTE) n = sendcount*sizeof(char);

  else if (sendtype == MPI_UNSIGNED_LONG) n = sendcount*sizeof(uint64_t);

  else if (sendtype == MPI_UNSIGNED_LONG_LONG) n = sendcount*sizeof(uint64_t);

  else if (sendtype == MPI_DOUBLE_INT) n = sendcount*sizeof(double_int);



  memcpy(recvbuf,sendbuf,n);

src/STUBS/mpi.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#define MPI_DOUBLE 3

#define MPI_CHAR 4

#define MPI_BYTE 5

#define MPI_UNSIGNED_LONG 6

#define MPI_UNSIGNED_LONG_LONG 6

#define MPI_DOUBLE_INT 7



#define MPI_SUM 1

src/compute_reduce.cpp

+2 −2
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ bigint ComputeReduce::count(int m) 
    } else if (flavor[m] == LOCAL) {

      bigint ncount = compute->size_local_rows;

      bigint ncountall;

      MPI_Allreduce(&ncount,&ncountall,1,MPI_UNSIGNED_LONG,MPI_SUM,world);

      MPI_Allreduce(&ncount,&ncountall,1,MPI_UNSIGNED_LONG_LONG,MPI_SUM,world);

      return ncountall;

    }

  } else if (which[m] == FIX) {
@@ -614,7 +614,7 @@ bigint ComputeReduce::count(int m) 
    } else if (flavor[m] == LOCAL) {

      bigint ncount = fix->size_local_rows;

      bigint ncountall;

      MPI_Allreduce(&ncount,&ncountall,1,MPI_UNSIGNED_LONG,MPI_SUM,world);

      MPI_Allreduce(&ncount,&ncountall,1,MPI_UNSIGNED_LONG_LONG,MPI_SUM,world);

      return ncountall;

    }

  } else if (which[m] == VARIABLE)

src/create_atoms.cpp

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ void CreateAtoms::command(int narg, char **arg) 
  // new total # of atoms



  bigint nblocal = atom->nlocal;

  MPI_Allreduce(&nblocal,&atom->natoms,1,MPI_UNSIGNED_LONG,MPI_SUM,world);

  MPI_Allreduce(&nblocal,&atom->natoms,1,MPI_UNSIGNED_LONG_LONG,MPI_SUM,world);



  // print status

src/delete_atoms.cpp

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void DeleteAtoms::command(int narg, char **arg) 
  // set nghost to 0 so old ghosts of deleted atoms won't be mapped



  bigint nblocal = atom->nlocal;

  MPI_Allreduce(&nblocal,&atom->natoms,1,MPI_UNSIGNED_LONG,MPI_SUM,world);

  MPI_Allreduce(&nblocal,&atom->natoms,1,MPI_UNSIGNED_LONG_LONG,MPI_SUM,world);

  if (atom->map_style) {

    atom->nghost = 0;

    atom->map_init();

CRA Git | Maintained and supported by SUSTech CRA and CCSE