diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-07-03 21:33:41 -0400 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2012-09-11 18:23:28 +0100 |
| commit | e8a3a2b23f413d1f4aa4484fd0d3dbd4152d4d58 (patch) | |
| tree | 7e2230d103d2ab48dfc469f4ed60a7bd2d42a522 /Carpet/CarpetRegrid2 | |
| parent | c6346d4090f31df49983a3aa4dcb97a6077f95e2 (diff) | |
Introduce cctk_ash, retire cctk_lssh
Introduce cctk_ash, describing the process-local array shape that has
been allocated. This may be larger than cctk_lsh, the process-local
shape that should be used.
Retire cctk_lssh and related infrastructure to handle staggered grid
functions.
Diffstat (limited to 'Carpet/CarpetRegrid2')
| -rw-r--r-- | Carpet/CarpetRegrid2/src/amr.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Carpet/CarpetRegrid2/src/amr.cc b/Carpet/CarpetRegrid2/src/amr.cc index 6d23dd9c0..26f78717c 100644 --- a/Carpet/CarpetRegrid2/src/amr.cc +++ b/Carpet/CarpetRegrid2/src/amr.cc @@ -102,12 +102,12 @@ namespace CarpetRegrid2 { } ivect const lbnd = ivect::ref(cctk_lbnd); - ivect const lssh (CCTK_LSSH(0,0), CCTK_LSSH(0,1), CCTK_LSSH(0,2)); + ivect const lsh = ivect::ref(cctk_lbnd); ivect const bboxlo (cctk_bbox[0], cctk_bbox[2], cctk_bbox[4]); ivect const bboxhi (cctk_bbox[1], cctk_bbox[3], cctk_bbox[5]); - ivect const imin = 0 + either(bboxlo, 0, nghostzones); - ivect const imax = lssh - either(bboxhi, 0, nghostzones); + ivect const imin = 0 + either(bboxlo, 0, nghostzones); + ivect const imax = lsh - either(bboxhi, 0, nghostzones); ivect const bmin = max (0, |