CarpetRegrid: Explicitly convert from/to CCTK_INT and from/to CCTK_REAL

Explicitly convert between int and CCTK_INT, and between double and
CCTK_REAL, where necessary.

darcs-hash:20060613171732-dae7b-87079cbe961564e3e247bf3bdc3d402cbf42a773.gz

1 files changed, 3 insertions, 2 deletions

diff --git a/Carpet/CarpetRegrid/src/automatic.cc b/Carpet/CarpetRegrid/src/automatic.cc
index f2e9af76b..18079de90 100644
--- a/Carpet/CarpetRegrid/src/automatic.cc
+++ b/Carpet/CarpetRegrid/src/automatic.cc
@@ -60,7 +60,7 @@ namespace CarpetRegrid {
     vector<ibbox> bbs;
     gh::cbnds obs;
     Automatic_OneLevel
-      (cctkGH, hh, reflevel, min(reflevels+1, refinement_levels),
+      (cctkGH, hh, reflevel, min(reflevels+1, (int)refinement_levels),
        errorgf, bbs, obs);
     
     // make multiprocessor aware
@@ -214,7 +214,8 @@ namespace CarpetRegrid {
     
     if (cnt == 0) {
       // Don't refine
-    } else if (any (reffact*width < 2*minwidth) or fraction >= minfraction) {
+    } else if (any (reffact*width < (int)(2*minwidth))
+               or fraction >= minfraction) {
       // Refine the whole region
       const ivect lo(region.lower());
       const ivect up(region.upper());