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

ring communication *is* called with outbut set to NULL, so don't error out on that.

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-02-24 17:17:45 +01:00
parent fb6e7e8aea
commit 948f4783aa
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/comm.cpp
View File

@ -696,7 +696,7 @@ void Comm::ring(int n, int nper, void *inbuf, int messtag,
if (maxbytes == 0) return; if (maxbytes == 0) return;
// sanity check 1 // sanity check
if ((nbytes > 0) && inbuf == NULL) if ((nbytes > 0) && inbuf == NULL)
error->one(FLERR,"Cannot put data on ring from NULL pointer"); error->one(FLERR,"Cannot put data on ring from NULL pointer");
@ -722,11 +722,6 @@ void Comm::ring(int n, int nper, void *inbuf, int messtag,
if (self || loop < nprocs-1) callback(nbytes/nper,buf,ptr); if (self || loop < nprocs-1) callback(nbytes/nper,buf,ptr);
} }
// sanity check 2
if ((nbytes > 0) && outbuf == NULL)
error->one(FLERR,"Cannot put data from ring to NULL pointer");
if (nbytes && outbuf) memcpy(outbuf,buf,nbytes); if (nbytes && outbuf) memcpy(outbuf,buf,nbytes);
memory->destroy(buf); memory->destroy(buf);