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

Fixing merge conflicts

Browse Source
This commit is contained in:
Joel Clemmer
2020-10-02 15:09:47 -06:00
parent 51d55aa036
commit b1b014aed3
27 changed files with 2413 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nbin.cpp
View File

@ -150,6 +150,15 @@ int NBin::coord2bin(double *x)
return (iz-mbinzlo)*mbiny*mbinx + (iy-mbinylo)*mbinx + (ix-mbinxlo);
}
/* ----------------------------------------------------------------------
to be overridden by NBinType
------------------------------------------------------------------------- */
int NBin::coord2bin(double * x, int itype)
{
error->all(FLERR,"coord2bin(x, itype) not available.\n");
return -1;
}
/* ---------------------------------------------------------------------- */