aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetRegrid/src/centre.cc
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@aei.mpg.de>2005-03-03 10:20:00 +0000
committerErik Schnetter <schnetter@aei.mpg.de>2005-03-03 10:20:00 +0000
commit14c22320cd7533b1925297dae8cd457fa5e51542 (patch)
treef9daf2364fe4539f3a775d74dbd0b34f5f3b6fb9 /Carpet/CarpetRegrid/src/centre.cc
parent537f37a7788c331b8fcf0af1075be327713dc8da (diff)
CarpetRegrid: Change "&&" and "||" to "and" and "or"
darcs-hash:20050303102007-891bb-dda44e75d217fbbd7e62cb43b509ec5096699b26.gz
Diffstat (limited to 'Carpet/CarpetRegrid/src/centre.cc')
-rw-r--r--Carpet/CarpetRegrid/src/centre.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/Carpet/CarpetRegrid/src/centre.cc b/Carpet/CarpetRegrid/src/centre.cc
index 2bcbda6eb..f9b384142 100644
--- a/Carpet/CarpetRegrid/src/centre.cc
+++ b/Carpet/CarpetRegrid/src/centre.cc
@@ -61,7 +61,7 @@ namespace CarpetRegrid {
ivect const half = (rub - rlb) / 2 / rstr * rstr;
rlb = oldrlb + symmetric.ifthen(zero, quarter);
rub = oldrub - symmetric.ifthen(half, quarter);
- assert (all(rlb >= oldrlb && rub <= oldrub));
+ assert (all(rlb >= oldrlb and rub <= oldrub));
ibbox const bb (rlb, rub, rstr);
vector<ibbox> bbs (1);