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

Correct cart_grid fields face_nodepos for 2D/3D and facepos for 2D.

Browse Source
This commit is contained in:
Ingeborg Ligaarden 2012-01-04 18:19:25 +01:00
parent dd4c0c2b1b
commit 355f9ebee7
1 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opm/core/utility/cart_grid.c
View File

@ -266,9 +266,10 @@ fill_cart_topology_3d(struct UnstructuredGrid *G, int nx, int ny, int nz)
} }
fnodes = G->face_nodes; fnodes = G->face_nodes;
fnodepos = G->face_nodepos; fnodepos = G->face_nodepos;
fcells = G->face_cells; fcells = G->face_cells;
fnodepos[0] = 0;
/* Faces with x-normal */ /* Faces with x-normal */
for (k=0; k<nz; ++k) { for (k=0; k<nz; ++k) {
@ -547,6 +548,7 @@ create_cart_grid(int nx, int ny, int nz)
fnormals = G->face_normals; fnormals = G->face_normals;
fcentroids = G->face_centroids; fcentroids = G->face_centroids;
fareas = G->face_areas; fareas = G->face_areas;
fnodepos[0] = 0;
/* Faces with x-normal */ /* Faces with x-normal */
for (k=0; k<nz; ++k) { for (k=0; k<nz; ++k) {
@ -761,12 +763,13 @@ fill_cart_topology_2d(struct UnstructuredGrid *G, int nx, int ny)
fnodes = G->face_nodes; fnodes = G->face_nodes;
fnodepos = G->face_nodepos; fnodepos = G->face_nodepos;
fcells = G->face_cells; fcells = G->face_cells;
fnodepos[0] = 0;
/* Faces with x-normal */ /* Faces with x-normal */
for (j=0; j<ny; ++j) { for (j=0; j<ny; ++j) {
for (i=0; i<nx+1; ++i) { for (i=0; i<nx+1; ++i) {
*fnodes++ = i+Nx*j; *fnodes++ = i+Nx*j;
*fnodes++ = i+Nx*j+1; *fnodes++ = i+Nx*(j+1);
fnodepos[1] = fnodepos[0] + 2; fnodepos[1] = fnodepos[0] + 2;
++fnodepos; ++fnodepos;
if (i==0) { if (i==0) {
@ -787,8 +790,8 @@ fill_cart_topology_2d(struct UnstructuredGrid *G, int nx, int ny)
/* Faces with y-normal */ /* Faces with y-normal */
for (j=0; j<ny+1; ++j) { for (j=0; j<ny+1; ++j) {
for (i=0; i<nx; ++i) { for (i=0; i<nx; ++i) {
*fnodes++ = i+ Nx*j;
*fnodes++ = i+1 + Nx*j; *fnodes++ = i+1 + Nx*j;
*fnodes++ = i+ Nx*j;
fnodepos[1] = fnodepos[0] + 2; fnodepos[1] = fnodepos[0] + 2;
++fnodepos; ++fnodepos;
if (j==0) { if (j==0) {