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

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

Browse Source
This commit is contained in:
sjplimp
2014-08-06 20:56:34 +00:00
parent 2861c9dfd3
commit 0e4940441e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/balance.cpp
View File

@ -488,14 +488,16 @@ int *Balance::bisection(int sortflag)
rcb->invert(sortflag); rcb->invert(sortflag);
// NOTE: this logic is specific to orthogonal boxes, not triclinic // NOTE: this logic is specific to orthogonal boxes, not triclinic
// NOTE: check this: insure comm->rcbcut will be exactly equal to sub-box boundaries it touches
// store RCB cut, dim, lo/hi box in CommTiled
// cut and lo/hi need to be in fractional form so can
// OK if changes by epsilon from what RCB used since particles
// will subsequently migrate to new owning procs by exchange() anyway
// ditto for particles exactly on lo/hi RCB box boundaries due to ties
comm->rcbnew = 1; comm->rcbnew = 1;
int idim = rcb->cutdim; int idim = rcb->cutdim;
//double split = (rcb->cut - boxlo[idim]) / prd[idim];
//comm->rcbcut = boxlo[idim] + prd[idim]*split;
comm->rcbcutfrac = (rcb->cut - boxlo[idim]) / prd[idim]; comm->rcbcutfrac = (rcb->cut - boxlo[idim]) / prd[idim];
comm->rcbcutdim = idim; comm->rcbcutdim = idim;

2
src/input.cpp
View File

@ -733,7 +733,7 @@ void Input::ifthenelse()
// must substitute on copy of arg else will step on subsequent args // must substitute on copy of arg else will step on subsequent args
// bound and execute "elif" or "else" commands // bound and execute "elif" or "else" commands
while (1) { while (iarg != narg) {
if (iarg+2 > narg) error->all(FLERR,"Illegal if command"); if (iarg+2 > narg) error->all(FLERR,"Illegal if command");
if (strcmp(arg[iarg],"elif") == 0) { if (strcmp(arg[iarg],"elif") == 0) {
n = strlen(arg[iarg+1]) + 1; n = strlen(arg[iarg+1]) + 1;