From e8a3a2b23f413d1f4aa4484fd0d3dbd4152d4d58 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 3 Jul 2012 21:33:41 -0400 Subject: 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. --- Carpet/CarpetRegrid2/src/amr.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Carpet/CarpetRegrid2') 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, -- cgit v1.2.3