OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust for M's 1-based indexing in the 'neighbours' connection

Browse Source 
array [%]

  Assign results to plhs[0] (and print diagnostic).
This commit is contained in:
Bård Skaflestad 2010-08-20 17:19:37 +00:00
parent 87949a432e
commit 7645981d14
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mex_partition_process.c
View File

@ -76,15 +76,15 @@ extract_neighbour(const mxArray *M_neigh, int *neigh)
pd = mxGetPr(M_neigh);
for (e = 0; e < ne; e++) {
neigh[2*e + 0] = pd[e + 0*ne];
neigh[2*e + 1] = pd[e + 1*ne];
neigh[2*e + 0] = pd[e + 0*ne] - 1;
neigh[2*e + 1] = pd[e + 1*ne] - 1;
}
} else {
pi = mxGetData(M_neigh);
for (e = 0; e < ne; e++) {
neigh[2*e + 0] = pi[e + 0*ne];
neigh[2*e + 1] = pi[e + 1*ne];
neigh[2*e + 0] = pi[e + 0*ne] - 1;
neigh[2*e + 1] = pi[e + 1*ne] - 1;
}
}
}
@ -164,7 +164,7 @@ mexFunction(int nlhs, mxArray *plhs[],
extract_neighbour(prhs[1], neigh);
nextra = partition_split_disconnected(nc, nneigh, neigh, p);
#if 0
if (nextra == 0) {
mexPrintf("Partition processing complete. No extra blocks.\n");
@ -177,7 +177,7 @@ mexFunction(int nlhs, mxArray *plhs[],
} else {
mexPrintf("Partition processing failed. Insufficient memory?\n");
}
#endif
deallocate_aux_arrays(p, neigh);
}
} else {