diff options
author | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-06-06 22:48:00 +0000 |
---|---|---|
committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-06-06 22:48:00 +0000 |
commit | 2335761379999b77f98aa22779ad7044761865bd (patch) | |
tree | 85428b46fe62a5b954ac4033f680d0572a0bc68f /Carpet/CarpetRegrid/src/automatic.cc | |
parent | 15d7454790a000423dd7be601ebdd84e9aa2905b (diff) |
CarpetRegrid: Explicitly convert vect<int> to vect<CCTK_REAL>
darcs-hash:20060606224858-dae7b-a0bdea5173286f76493679cc1f98c3b7ee51e21c.gz
Diffstat (limited to 'Carpet/CarpetRegrid/src/automatic.cc')
-rw-r--r-- | Carpet/CarpetRegrid/src/automatic.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Carpet/CarpetRegrid/src/automatic.cc b/Carpet/CarpetRegrid/src/automatic.cc index 82dbd5796..57d0ac7fc 100644 --- a/Carpet/CarpetRegrid/src/automatic.cc +++ b/Carpet/CarpetRegrid/src/automatic.cc @@ -146,10 +146,12 @@ namespace CarpetRegrid { // Remove grid points outside the outer boundary bbvect const obp (false); for (size_t c=0; c<bbs.size(); ++c) { - const ivect lb = xpose(obp)[0].ifthen - (bbs.at(c).lower(), max (bbs.at(c).lower(), hh.baseextent.lower())); - const ivect ub = xpose(obp)[1].ifthen - (bbs.at(c).upper(), min (bbs.at(c).upper(), hh.baseextent.upper())); + const ivect lb = either (xpose(obp)[0], + bbs.at(c).lower(), + max (bbs.at(c).lower(), hh.baseextent.lower())); + const ivect ub = either (xpose(obp)[1], + bbs.at(c).upper(), + min (bbs.at(c).upper(), hh.baseextent.upper())); bbs.at(c) = ibbox(lb, ub, bbs.at(c).stride()); } |