X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FGrid.hs;h=d9fa975eedc7498989d601394b7e686c72ff0d41;hb=b2e1c440b9b1bb99ae564d6600230bbd1f7d204c;hp=8bf83828e9f23a97de57360ffeded92ebb92ccd2;hpb=173d34c0d529830efeab39b7cca9a03856514469;p=spline3.git

diff --git a/src/Grid.hs b/src/Grid.hs
index 8bf8382..d9fa975 100644
--- a/src/Grid.hs
+++ b/src/Grid.hs
@@ -57,7 +57,10 @@ cubes g
                  | i <- [0..xmax],
                    j <- [0..ymax],
                    k <- [0..zmax],
-                   let cube_ijk = Cube (h g) i j k (make_values fvs i j k)]
+                   let delta = h g,
+                   let tet_vol = (1/24)*(delta^(3::Int)),
+                   let cube_ijk =
+                         Cube delta i j k (make_values fvs i j k) tet_vol]
      where
        xmax = xsize - 1
        ymax = ysize - 1
@@ -96,6 +99,7 @@ calculate_containing_cube_coordinate g coord
     -- returns cube #1 if we would have returned cube #0 and cube #1
     -- exists.
     | coord == offset && (xsize > 0 && ysize > 0 && zsize > 0) = 1
+    | coord < offset = 0
     | otherwise = (ceiling ( (coord + offset) / cube_width )) - 1
     where
       (xsize, ysize, zsize) = dims (function_values g)