Undo the previous FunctionValues test fix.

Update the Values.idx function to silently switch the 'x' and 'z' dimensions.

diff --git a/src/Tests/FunctionValues.hs b/src/Tests/FunctionValues.hs
index e14da7b5847baf2822db0366b966b855a98e04d3..9cada35a30c670723af1e1c26f06a8a90b1fe834 100644 (file)
--- a/src/Tests/FunctionValues.hs
+++ b/src/Tests/FunctionValues.hs
@@ -11,7 +11,7 @@ test_directions :: Assertion
 test_directions =
     assertTrue "all direction functions work" (and equalities)
         where
-          fvs = make_values trilinear_repa 1 1 1
+          fvs = make_values trilinear 1 1 1
           equalities = [ interior fvs == 4,
                          front fvs == 1,
                          back  fvs == 7,

diff --git a/src/Values.hs b/src/Values.hs
index 1b8548e026a52195cd7a739351f0e4a90a1c95e0..61e3a11d3c2cd274afb5963bd5ba4091c8d4df86 100644 (file)
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -79,7 +79,7 @@ idx v3d i j k =
     index v3d shape
     where
       shape :: DIM3
-      shape = (Z :. i :. j :. k)
+      shape = (Z :. k :. j :. i)
 
 
 zoom_shape :: Int -> DIM3 -> DIM3