From d5a022a661e2099790a88832318dd6b9aa194193 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 13 Jun 2006 17:17:00 +0000 Subject: 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 --- Carpet/CarpetRegrid/src/automatic.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Carpet/CarpetRegrid/src/automatic.cc') 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 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()); -- cgit v1.2.3