From 624d6177dfb6f7014c24f3fa6aa6a2be55c6cba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Tue, 14 Aug 2012 10:44:17 +0200 Subject: [PATCH] Restore coding conventions. Inadvertently lost in commit 064184b. --- opm/core/grid.c | 4 ++-- opm/core/grid/cart_grid.c | 22 ++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/opm/core/grid.c b/opm/core/grid.c index 07250ea3..9fa4cd67 100644 --- a/opm/core/grid.c +++ b/opm/core/grid.c @@ -104,7 +104,7 @@ allocate_grid(size_t ndims , nel = ncellfaces; 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; G->cell_facepos = malloc(nel * sizeof *G->cell_facepos); @@ -123,7 +123,7 @@ allocate_grid(size_t ndims , (G->face_normals == NULL) || (G->face_areas == NULL) || (G->cell_faces == NULL) || - (G->cell_facetag == NULL) || + (G->cell_facetag == NULL) || (G->cell_facepos == NULL) || (G->cell_centroids == NULL) || (G->cell_volumes == NULL) ) diff --git a/opm/core/grid/cart_grid.c b/opm/core/grid/cart_grid.c index 25c04d24..989bbfe6 100644 --- a/opm/core/grid/cart_grid.c +++ b/opm/core/grid/cart_grid.c @@ -262,15 +262,13 @@ fill_cart_topology_3d(struct UnstructuredGrid *G) } } } - - for (k=0; k< nx*ny*nz;++k){ - for (i=0; i < 6; ++i){ - G->cell_facetag[k*6+i]=i; - } + + for (k = 0; k < nx * ny * nz; ++k) { + for (i = 0; i < 6; ++i) { + G->cell_facetag[k*6 + i] = i; + } } - - fnodes = G->face_nodes; fnodepos = G->face_nodepos; fcells = G->face_cells; @@ -572,11 +570,11 @@ fill_cart_topology_2d(struct UnstructuredGrid *G) } } - for (j=0; j< nx*ny;++j){ - G->cell_facetag[j*4+0]=0; - G->cell_facetag[j*4+1]=2; - G->cell_facetag[j*4+2]=1; - G->cell_facetag[j*4+3]=3; + for (j = 0; j < nx * ny; ++j) { + G->cell_facetag[j*4 + 0] = 0; + G->cell_facetag[j*4 + 1] = 2; + G->cell_facetag[j*4 + 2] = 1; + G->cell_facetag[j*4 + 3] = 3; }