From 2335761379999b77f98aa22779ad7044761865bd Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@cct.lsu.edu>
Date: Tue, 6 Jun 2006 22:48:00 +0000
Subject: CarpetRegrid: Explicitly convert vect<int> to vect<CCTK_REAL>

darcs-hash:20060606224858-dae7b-a0bdea5173286f76493679cc1f98c3b7ee51e21c.gz
---
 Carpet/CarpetRegrid/src/automatic.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'Carpet/CarpetRegrid/src/automatic.cc')

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());
     }
     
-- 
cgit v1.2.3