Skip to content
Snippets Groups Projects
Commit 2e60e461 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

must convert regions bounding box to lattice coordinates before checking to...

must convert regions bounding box to lattice coordinates before checking to reduce lattice creation range
parent 8338969a
No related branches found
No related tags found
No related merge requests found
...@@ -709,6 +709,7 @@ void CreateAtoms::add_lattice() ...@@ -709,6 +709,7 @@ void CreateAtoms::add_lattice()
xmin = ymin = zmin = BIG; xmin = ymin = zmin = BIG;
xmax = ymax = zmax = -BIG; xmax = ymax = zmax = -BIG;
// convert to lattice coordinates and set bounding box
domain->lattice->bbox(1,bboxlo[0],bboxlo[1],bboxlo[2], domain->lattice->bbox(1,bboxlo[0],bboxlo[1],bboxlo[2],
xmin,ymin,zmin,xmax,ymax,zmax); xmin,ymin,zmin,xmax,ymax,zmax);
domain->lattice->bbox(1,bboxhi[0],bboxlo[1],bboxlo[2], domain->lattice->bbox(1,bboxhi[0],bboxlo[1],bboxlo[2],
...@@ -729,12 +730,14 @@ void CreateAtoms::add_lattice() ...@@ -729,12 +730,14 @@ void CreateAtoms::add_lattice()
// narrow down min/max further by extent of the region, if possible // narrow down min/max further by extent of the region, if possible
if ((style == REGION) && domain->regions[nregion]->bboxflag) { if ((style == REGION) && domain->regions[nregion]->bboxflag) {
const double rxmin = domain->regions[nregion]->extent_xlo; double rxmin = domain->regions[nregion]->extent_xlo;
const double rxmax = domain->regions[nregion]->extent_xhi; double rxmax = domain->regions[nregion]->extent_xhi;
const double rymin = domain->regions[nregion]->extent_ylo; double rymin = domain->regions[nregion]->extent_ylo;
const double rymax = domain->regions[nregion]->extent_yhi; double rymax = domain->regions[nregion]->extent_yhi;
const double rzmin = domain->regions[nregion]->extent_zlo; double rzmin = domain->regions[nregion]->extent_zlo;
const double rzmax = domain->regions[nregion]->extent_zhi; double rzmax = domain->regions[nregion]->extent_zhi;
domain->lattice->box2lattice(rxmin,rymin,rzmin);
domain->lattice->box2lattice(rxmax,rymax,rzmax);
if (rxmin > xmin) xmin = (rxmin > xmax) ? xmax : rxmin; if (rxmin > xmin) xmin = (rxmin > xmax) ? xmax : rxmin;
if (rxmax < xmax) xmax = (rxmax < xmin) ? xmin : rxmax; if (rxmax < xmax) xmax = (rxmax < xmin) ? xmin : rxmax;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment