aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetReduce/src/mask_carpet.cc
diff options
context:
space:
mode:
authorschnetter <>2004-06-15 14:45:00 +0000
committerschnetter <>2004-06-15 14:45:00 +0000
commit3f386ab6230f9dcb6713606aee748cf5abc3a56b (patch)
tree914c86fcb7312b983bffcd37bf3a780ba727c421 /Carpet/CarpetReduce/src/mask_carpet.cc
parent962181e7e8f11d4ca488b9f36ff4b6fe4e70fc89 (diff)
Don't require the local boxes to be non-empty.
darcs-hash:20040615144529-07bb3-781ff26e87e690804ad8f2faf5294df94847be25.gz
Diffstat (limited to 'Carpet/CarpetReduce/src/mask_carpet.cc')
-rw-r--r--Carpet/CarpetReduce/src/mask_carpet.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/Carpet/CarpetReduce/src/mask_carpet.cc b/Carpet/CarpetReduce/src/mask_carpet.cc
index 0504ad217..383d3cb6e 100644
--- a/Carpet/CarpetReduce/src/mask_carpet.cc
+++ b/Carpet/CarpetReduce/src/mask_carpet.cc
@@ -10,7 +10,7 @@
#include "mask_carpet.hh"
extern "C" {
- static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/mask_carpet.cc,v 1.1 2004/06/14 07:01:21 schnetter Exp $";
+ static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/mask_carpet.cc,v 1.2 2004/06/15 16:45:29 schnetter Exp $";
CCTK_FILEVERSION(Carpet_CarpetMask_Mask_cc);
}
@@ -111,7 +111,7 @@ namespace CarpetMask {
ivect const imin = (box.lower() - ext.lower() ) / ext.stride();
ivect const imax = (box.upper() - ext.lower() + ext.stride()) / ext.stride();
assert (all (izero <= imin));
- assert (all (imin <= imax));
+ assert (box.empty() || all (imin <= imax));
assert (all (imax <= ivect::ref(cctk_lsh)));
if (verbose) {
@@ -164,7 +164,7 @@ namespace CarpetMask {
ivect const imin = (box.lower() - ext.lower() ) / ext.stride();
ivect const imax = (box.upper() - ext.lower() + ext.stride()) / ext.stride();
assert (all (izero <= imin));
- assert (all (imin <= imax));
+ assert (box.empty() || all (imin <= imax));
assert (all (imax <= ivect::ref(cctk_lsh)));
if (verbose) {
@@ -196,7 +196,7 @@ namespace CarpetMask {
ivect const imin = (box.lower() - ext.lower() ) / ext.stride();
ivect const imax = (box.upper() - ext.lower() + ext.stride()) / ext.stride();
assert (all (izero <= imin));
- assert (all (imin <= imax));
+ assert (box.empty() || all (imin <= imax));
assert (all (imax <= ivect::ref(cctk_lsh)));
if (verbose) {