diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-06-06 22:51:00 +0000 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-06-06 22:51:00 +0000 |
| commit | b745b5d4a4ea7348e2be2e0770ae0bb54e6ec83d (patch) | |
| tree | ced1b5234ca1cd678c40bb3463be9fff26b3a3d8 /CarpetDev | |
| parent | a4742544b7f6fc57e673d926e50c645db142dede (diff) | |
CarpetAdaptiveRegrid: Explicitly convert vect<int> to vect<CCTK_REAL>
darcs-hash:20060606225122-dae7b-47dd6f8d83784dee0b7b56c36341a5609a82e9f1.gz
Diffstat (limited to 'CarpetDev')
| -rw-r--r-- | CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc | 4 | ||||
| -rw-r--r-- | CarpetDev/CarpetAdaptiveRegrid/src/manualcoordinatelist.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc b/CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc index ed01bd34c..ac0d1318c 100644 --- a/CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc +++ b/CarpetDev/CarpetAdaptiveRegrid/src/CAR.cc @@ -824,7 +824,7 @@ namespace CarpetAdaptiveRegrid { rvect hi = int2pos(cctkGH, hh, ihi, reflevel); rvect str = base_spacing * ipow((CCTK_REAL)mgfact, basemglevel) / - spacereffacts.at(reflevel); + rvect (spacereffacts.at(reflevel)); rbbox newbbcoord(lo, hi, str); if (veryverbose) { @@ -844,7 +844,7 @@ namespace CarpetAdaptiveRegrid { rvect const spacing = base_spacing * ipow((CCTK_REAL)mgfact, basemglevel) / - ipow(reffact, reflevel+1); + rvect (ipow(reffact, reflevel+1)); ierr = ConvertFromPhysicalBoundary (dim, &physical_min[0], &physical_max[0], &interior_min[0], &interior_max[0], diff --git a/CarpetDev/CarpetAdaptiveRegrid/src/manualcoordinatelist.cc b/CarpetDev/CarpetAdaptiveRegrid/src/manualcoordinatelist.cc index 1768aa6ed..86e0afd20 100644 --- a/CarpetDev/CarpetAdaptiveRegrid/src/manualcoordinatelist.cc +++ b/CarpetDev/CarpetAdaptiveRegrid/src/manualcoordinatelist.cc @@ -80,7 +80,7 @@ namespace CarpetAdaptiveRegrid { for (size_t c=0; c<newobss.at(rl).size(); ++c) { for (int d=0; d<dim; ++d) { assert (mglevel==0); - rvect const spacing = base_spacing * ipow((CCTK_REAL)mgfact, basemglevel) / spacereffacts.at(rl+1); + rvect const spacing = base_spacing * ipow((CCTK_REAL)mgfact, basemglevel) / rvect (spacereffacts.at(rl+1)); ierr = ConvertFromPhysicalBoundary (dim, &physical_min[0], &physical_max[0], &interior_min[0], &interior_max[0], @@ -124,7 +124,7 @@ namespace CarpetAdaptiveRegrid { bbvect const & ob = newobss.at(rl-1).at(c); // TODO: why can basemglevel not be used here? // rvect const spacing = base_spacing * ipow(CCTK_REAL(mgfact), basemglevel) / ipow(reffact, rl); - rvect const spacing = base_spacing / spacereffacts.at(rl); + rvect const spacing = base_spacing / rvect (spacereffacts.at(rl)); if (! all(abs(ext.stride() - spacing) < spacing * 1.0e-10)) { assert (dim==3); CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING, |