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

Restore coding conventions.

Browse Source 
Inadvertently lost in commit 064184b.
This commit is contained in:
Bård Skaflestad 2012-08-14 10:44:17 +02:00
parent b4175e5c2b
commit 624d6177df
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/core/grid.c
View File

@ -104,7 +104,7 @@ allocate_grid(size_t ndims ,
nel = ncellfaces; nel = ncellfaces;
G->cell_faces = malloc(nel * sizeof *G->cell_faces); G->cell_faces = malloc(nel * sizeof *G->cell_faces);
G->cell_facetag = malloc(nel * sizeof *G->cell_facetag); G->cell_facetag = malloc(nel * sizeof *G->cell_facetag);
nel = ncells + 1; nel = ncells + 1;
G->cell_facepos = malloc(nel * sizeof *G->cell_facepos); G->cell_facepos = malloc(nel * sizeof *G->cell_facepos);
@ -123,7 +123,7 @@ allocate_grid(size_t ndims ,
(G->face_normals == NULL) || (G->face_normals == NULL) ||
(G->face_areas == NULL) || (G->face_areas == NULL) ||
(G->cell_faces == NULL) || (G->cell_faces == NULL) ||
(G->cell_facetag == NULL) || (G->cell_facetag == NULL) ||
(G->cell_facepos == NULL) || (G->cell_facepos == NULL) ||
(G->cell_centroids == NULL) || (G->cell_centroids == NULL) ||
(G->cell_volumes == NULL) ) (G->cell_volumes == NULL) )

22
opm/core/grid/cart_grid.c
View File

@ -262,15 +262,13 @@ fill_cart_topology_3d(struct UnstructuredGrid *G)
} }
} }
} }
for (k=0; k< nx*ny*nz;++k){ for (k = 0; k < nx * ny * nz; ++k) {
for (i=0; i < 6; ++i){ for (i = 0; i < 6; ++i) {
G->cell_facetag[k*6+i]=i; G->cell_facetag[k*6 + i] = i;
} }
} }
fnodes = G->face_nodes; fnodes = G->face_nodes;
fnodepos = G->face_nodepos; fnodepos = G->face_nodepos;
fcells = G->face_cells; fcells = G->face_cells;
@ -572,11 +570,11 @@ fill_cart_topology_2d(struct UnstructuredGrid *G)
} }
} }
for (j=0; j< nx*ny;++j){ for (j = 0; j < nx * ny; ++j) {
G->cell_facetag[j*4+0]=0; G->cell_facetag[j*4 + 0] = 0;
G->cell_facetag[j*4+1]=2; G->cell_facetag[j*4 + 1] = 2;
G->cell_facetag[j*4+2]=1; G->cell_facetag[j*4 + 2] = 1;
G->cell_facetag[j*4+3]=3; G->cell_facetag[j*4 + 3] = 3;
} }