diff options
author | Ian Hawke <ih@maths.soton.ac.uk> | 2005-02-10 13:40:00 +0000 |
---|---|---|
committer | Ian Hawke <ih@maths.soton.ac.uk> | 2005-02-10 13:40:00 +0000 |
commit | 14fe7ff074db613b32bbe315e2091a059c085197 (patch) | |
tree | b746cffc4e5112d305bf6ec48df0fe0e8d8ed52e /CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc | |
parent | 91f6a1d0599a00ae5e0de4b1212b0b2d7cc139db (diff) |
Correct outer boundary check
Correct the outer boundary check so that there's no more assertion
failures. However, the outer boundary is of course not dealt with
correctly yet.
darcs-hash:20050210134049-58c7f-e1e31185738d7ef7cd4f2ae7517b3722e0103cfa.gz
Diffstat (limited to 'CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc')
-rw-r--r-- | CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc b/CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc index 70a79568b..5f198ba26 100644 --- a/CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc +++ b/CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc @@ -191,9 +191,9 @@ namespace CarpetAdaptiveRegrid { assert (ii >= 0); assert (jj >= 0); assert (kk >= 0); - assert (ii < imax[0] - imin[0]); - assert (jj < imax[1] - imin[1]); - assert (kk < imax[2] - imin[2]); + assert (ii <= imax[0] - imin[0]); + assert (jj <= imax[1] - imin[1]); + assert (kk <= imax[2] - imin[2]); CCTK_INT mindex = ii + (imax[0] - imin[0] + 1)*(jj + (imax[1] - imin[1] + 1) * kk); mask[mindex] = 1; @@ -435,6 +435,8 @@ namespace CarpetAdaptiveRegrid { ivect str = bb.stride() / reffact; newbbs.push_back (ibbox(lo,hi,str)); + // FIXME: Set the correct ob here. + bbvect ob(false); obs.push_back(ob); } |