CarpetRegrid: Explicitly convert vect<int> to vect<CCTK_REAL>

darcs-hash:20060606224858-dae7b-a0bdea5173286f76493679cc1f98c3b7ee51e21c.gz

3 files changed, 10 insertions, 7 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());
     }
     
diff --git a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
index 01c8ac922..b993d3a3d 100644
--- a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
+++ b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
@@ -88,7 +88,8 @@ namespace CarpetRegrid {
         ivect const spacereffact = spacereffacts.at(rl+1);
         assert (mglevel==0);
         rvect const spacing =
-          base_spacing * ipow((CCTK_REAL)mgfact, basemglevel) / spacereffact;
+          base_spacing * ipow((CCTK_REAL)mgfact, basemglevel)
+          / rvect(spacereffact);
         ierr = ConvertFromPhysicalBoundary
           (dim, &physical_min[0], &physical_max[0],
            &interior_min[0], &interior_max[0],
@@ -175,7 +176,7 @@ namespace CarpetRegrid {
         // convergence_level), so that the user does not have to
         // change the parameter file when the convergence level is
         // changed.
-        rvect const spacing = base_spacing / spacereffact;
+        rvect const spacing = base_spacing / rvect(spacereffact);
         if (! all(abs(ext.stride() - spacing) < spacing * 1.0e-10)) {
           assert (dim==3);
           CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,
diff --git a/Carpet/CarpetRegrid/src/moving.cc b/Carpet/CarpetRegrid/src/moving.cc
index 03c596d71..4580a0b93 100644
--- a/Carpet/CarpetRegrid/src/moving.cc
+++ b/Carpet/CarpetRegrid/src/moving.cc
@@ -50,7 +50,7 @@ namespace CarpetRegrid {
          moving_centre_y + moving_circle_radius * sin(argument),
          moving_centre_z);
       rvect const radius
-        (rvect(moving_region_radius) / spacereffacts.at(rl-1));
+        (rvect(moving_region_radius) / rvect(spacereffacts.at(rl-1)));
       
       rvect const rlb (symmetric.ifthen (rvect(0), pos - radius));
       rvect const rub (symmetric.ifthen (radius  , pos + radius));