global: Add varying refinement factors

Add support for varying refinement factors.  The spatial refinement
factors can be different in different directions, can be different
from the time refinement factor, and can be different on each level.
(However, the underlying spatial transport operators do currently not
handle any factors except two.)

darcs-hash:20050501205010-891bb-8d3a74abaad55ee6c77ef18d51fca2a2b69740de.gz

1 files changed, 2 insertions, 2 deletions

diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc
index e7798b9ba..1916ef513 100644
--- a/Carpet/CarpetInterp/src/interp.cc
+++ b/Carpet/CarpetInterp/src/interp.cc
@@ -232,7 +232,7 @@ namespace CarpetInterp {
     }
 #else
     rvect const lower = rvect::ref(cgh->cctk_origin_space);
-    rvect const delta = rvect::ref(cgh->cctk_delta_space) / maxreflevelfact;
+    rvect const delta = rvect::ref(cgh->cctk_delta_space) / maxspacereflevelfact;
     rvect const upper = lower + delta * (vhh.at(m)->baseextent.upper() - vhh.at(m)->baseextent.lower());
 #endif
     
@@ -272,7 +272,7 @@ namespace CarpetInterp {
       if (all(pos>=lower && pos<=upper)) {
         for (int rl=maxrl-1; rl>=minrl; --rl) {
           
-          int const fact = maxreflevelfact / ipow(reffact, rl) * ipow(mgfact, mglevel);
+          ivect const fact = maxspacereflevelfact / spacereffacts.at(rl) * ipow(mgfact, mglevel);
           ivect const ipos = ivect(floor((pos - lower) / (delta * fact) + 0.5)) * fact;
           assert (all(ipos % vhh.at(m)->bases().at(ml).at(rl).stride() == 0));