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

Merge branch 'master' into multi_epcc

Browse Source
This commit is contained in:
Joel Clemmer
2021-04-07 16:34:01 -06:00
parent d9d5d3a36a 6569c2e434
commit d54384dd91
1932 changed files with 164955 additions and 123175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/comm.cpp
View File

@ -159,16 +159,11 @@ void Comm::copy_arrays(Comm *oldcomm)
memcpy(cutusermultiold,oldcomm->cutusermultiold,atom->ntypes+1);
}
if (customfile) {
int n = strlen(oldcomm->customfile) + 1;
customfile = new char[n];
strcpy(customfile,oldcomm->customfile);
}
if (outfile) {
int n = strlen(oldcomm->outfile) + 1;
outfile = new char[n];
strcpy(outfile,oldcomm->outfile);
}
if (customfile)
customfile = utils::strdup(oldcomm->customfile);
if (outfile)
outfile = utils::strdup(oldcomm->outfile);
}
/* ----------------------------------------------------------------------
@ -464,9 +459,7 @@ void Comm::set_processors(int narg, char **arg)
if (iarg+3 > narg) error->all(FLERR,"Illegal processors command");
gridflag = CUSTOM;
delete [] customfile;
int n = strlen(arg[iarg+2]) + 1;
customfile = new char[n];
strcpy(customfile,arg[iarg+2]);
customfile = utils::strdup(arg[iarg+2]);
iarg += 1;
} else error->all(FLERR,"Illegal processors command");
@ -526,9 +519,7 @@ void Comm::set_processors(int narg, char **arg)
} else if (strcmp(arg[iarg],"file") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal processors command");
delete [] outfile;
int n = strlen(arg[iarg+1]) + 1;
outfile = new char[n];
strcpy(outfile,arg[iarg+1]);
outfile = utils::strdup(arg[iarg+1]);
iarg += 2;
} else error->all(FLERR,"Illegal processors command");
@ -1059,7 +1050,7 @@ rendezvous_all2all(int n, char *inbuf, int insize, int inorder, int *procs,
offsets[0] = 0;
for (int i = 1; i < nprocs; i++)
offsets[i] = offsets[i-1] + insize*procs_a2a[i-1];
offsets[i] = offsets[i-1] + (bigint)insize*procs_a2a[i-1];
bigint offset = 0;
for (int i = 0; i < n; i++) {
@ -1069,7 +1060,8 @@ rendezvous_all2all(int n, char *inbuf, int insize, int inorder, int *procs,
offset += insize;
}
all2all1_bytes = nprocs*sizeof(int) + nprocs*sizeof(bigint) + n*insize;
all2all1_bytes = nprocs*sizeof(int) + nprocs*sizeof(bigint)
+ (bigint)n*insize;
} else {
procs_a2a = procs;
@ -1165,7 +1157,7 @@ rendezvous_all2all(int n, char *inbuf, int insize, int inorder, int *procs,
offsets[0] = 0;
for (int i = 1; i < nprocs; i++)
offsets[i] = offsets[i-1] + outsize*procs_a2a[i-1];
offsets[i] = offsets[i-1] + (bigint)outsize*procs_a2a[i-1];
bigint offset = 0;
for (int i = 0; i < nrvous_out; i++) {
@ -1176,7 +1168,7 @@ rendezvous_all2all(int n, char *inbuf, int insize, int inorder, int *procs,
}
all2all2_bytes = nprocs*sizeof(int) + nprocs*sizeof(bigint) +
nrvous_out*outsize;
(bigint)nrvous_out*outsize;
} else {
procs_a2a = procs_rvous;