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

Catch up with change in grid structure.

Browse Source
This commit is contained in:
Jostein R. Natvig committed 2010-01-05 15:43:59 +00:00
1 parent d5c900de11
commit f795a753ed
1 file changed
+13 -10
Download Patch File Download Diff File Expand all files Collapse all files
processgrid.c
+13 -10
View File
@@ -48,7 +48,7 @@ along with OpenRS. If not, see <http://www.gnu.org/licenses/>.
void fill_grid(mxArray **out, struct processed_grid *grid) void fill_grid(mxArray **out, struct processed_grid *grid)
{ {
const char *names[] = {"nodes", "faces", "cells", "cellFaces", "faceNodes", "cartDims"}; const char *names[] = {"nodes", "faces", "cells", "cartDims"};
mxArray *G = mxCreateStructMatrix(1,1,sizeof names / sizeof names[0],names); mxArray *G = mxCreateStructMatrix(1,1,sizeof names / sizeof names[0],names);
int i,j; int i,j;
@@ -57,7 +57,7 @@ void fill_grid(mxArray **out, struct processed_grid *grid)
/* nodes */ /* nodes */
const char *n2[] = {"num", "coords"}; const char *n2[] = {"num", "coords"};
mxArray *nodes = mxCreateStructMatrix(1,1,2,n2); mxArray *nodes = mxCreateStructMatrix(1,1,sizeof n2 / sizeof n2[0],n2);
mxSetField(nodes, 0, "num", mxCreateDoubleScalar(grid->number_of_nodes)); mxSetField(nodes, 0, "num", mxCreateDoubleScalar(grid->number_of_nodes));
mxArray *nodecoords = mxCreateDoubleMatrix(grid->number_of_nodes, 3, mxREAL); mxArray *nodecoords = mxCreateDoubleMatrix(grid->number_of_nodes, 3, mxREAL);
@@ -75,8 +75,8 @@ void fill_grid(mxArray **out, struct processed_grid *grid)
/* faces */ /* faces */
const char *n3[] = {"num", "neighbors", "numNodes", "nodePos", "tag"}; const char *n3[] = {"num", "neighbors", "nodes", "numNodes", "nodePos", "tag"};
mxArray *faces = mxCreateStructMatrix(1,1,5,n3); mxArray *faces = mxCreateStructMatrix(1,1,sizeof n3 / sizeof n3[0], n3);
mxSetField(faces, 0, "num", mxCreateDoubleScalar(grid->number_of_faces)); mxSetField(faces, 0, "num", mxCreateDoubleScalar(grid->number_of_faces));
@@ -130,10 +130,9 @@ void fill_grid(mxArray **out, struct processed_grid *grid)
} }
mxSetField(faces, 0, "tag", tags); mxSetField(faces, 0, "tag", tags);
mxSetField(G, 0, "faces", faces);
const char *n4[] = {"num", "facePos", "indexMap"}; const char *n4[] = {"num", "faces", "facePos", "indexMap"};
mxArray *cells = mxCreateStructMatrix(1,1,3,n4); mxArray *cells = mxCreateStructMatrix(1,1,sizeof n4 / sizeof n4[0], n4);
mxSetField(cells, 0, "num", mxCreateDoubleScalar(grid->number_of_cells)); mxSetField(cells, 0, "num", mxCreateDoubleScalar(grid->number_of_cells));
@@ -172,7 +171,6 @@ void fill_grid(mxArray **out, struct processed_grid *grid)
} }
mxSetField(cells, 0, "facePos", facepos); mxSetField(cells, 0, "facePos", facepos);
mxSetField(G, 0, "cells", cells);
int *counter = calloc(grid->number_of_cells, sizeof(*counter)); int *counter = calloc(grid->number_of_cells, sizeof(*counter));
@@ -198,8 +196,9 @@ void fill_grid(mxArray **out, struct processed_grid *grid)
if(c2 != -1) iptr[counter[c2]++] = i+1; if(c2 != -1) iptr[counter[c2]++] = i+1;
} }
} }
mxSetField(G, 0, "cellFaces", cellfaces); mxSetField(cells, 0, "faces", cellfaces);
mxSetField(G, 0, "cells", cells);
int n = grid->face_ptr[grid->number_of_faces]; int n = grid->face_ptr[grid->number_of_faces];
@@ -212,7 +211,11 @@ void fill_grid(mxArray **out, struct processed_grid *grid)
iptr[i] = grid->face_nodes[i]+1; iptr[i] = grid->face_nodes[i]+1;
} }
} }
mxSetField(G, 0, "faceNodes", facenodes); mxSetField(faces, 0, "nodes", facenodes);
mxSetField(G, 0, "faces", faces);
free(counter); free(counter);
mxArray *cartDims = mxCreateDoubleMatrix(1, 3, mxREAL); mxArray *cartDims = mxCreateDoubleMatrix(1, 3, mxREAL);