Merge pull request #98 from bska/use-standard-lin-index

Derive 'start' from traditional linear index expression
This commit is contained in:
Atgeirr Flø Rasmussen 2012-11-14 23:51:20 -08:00
commit d58dded067

View File

@ -647,14 +647,17 @@ vert_size(const struct grdecl *in,
const size_t off[8]) const size_t off[8])
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
size_t i, j, k, start; size_t i, j, k, nx, ny, start;
double dz; double dz;
const double *zcorn; const double *zcorn;
ind2sub(in->dims[0], in->dims[1], in->dims[2], c, &i, &j, &k); nx = in->dims[ 0 ];
ny = in->dims[ 1 ];
ind2sub(nx, ny, in->dims[ 2 ], c, &i, &j, &k);
zcorn = in->zcorn; zcorn = in->zcorn;
start = ((2 * k) * off[4]) + ((2 * j) * off[2]) + ((2 * i) * off[1]); start = (2 * i) + (2 * nx)*((2 * j) + (2 * ny)*(2 * k));
for (k = 0, dz = 0.0; (! (fabs(dz) > 0)) && (k < 4); k++) { for (k = 0, dz = 0.0; (! (fabs(dz) > 0)) && (k < 4); k++) {
dz = zcorn[start + off[k + 4]] - zcorn[start + off[k]]; dz = zcorn[start + off[k + 4]] - zcorn[start + off[k]];