diff --git a/opm/core/utility/cart_grid.c b/opm/core/utility/cart_grid.c index 82ed3d98..f59f523b 100644 --- a/opm/core/utility/cart_grid.c +++ b/opm/core/utility/cart_grid.c @@ -437,227 +437,6 @@ fill_cart_geometry_3d(struct UnstructuredGrid *G, int nx, int ny, int nz) /* --------------------------------------------------------------------- */ -struct UnstructuredGrid* -create_cart_grid(int nx, int ny, int nz) -{ - int i,j,k; - int nxf, nyf, nzf; - int Nx, Ny, Nz; - - struct UnstructuredGrid *G; - double *coord, *ccentroids, *cvolumes; - double *fnormals, *fcentroids, *fareas; - - int *fnodes, *fnodepos, *fcells, *cfaces, *cfacepos; - - G = malloc(1 * sizeof *G); - if (G == NULL) - { - fprintf(stderr, "Cannot allocate space for grid.\n"); - exit(EXIT_FAILURE); - } - - G->dimensions = 3; - - Nx = nx+1; - Ny = ny+1; - Nz = nz+1; - - nxf = Nx*ny*nz; - nyf = nx*Ny*nz; - nzf = nx*ny*Nz; - - G->number_of_cells = nx*ny*nz; - G->number_of_faces = nxf+nyf+nzf; - G->number_of_nodes = Nx*Ny*Nz; - - G->node_coordinates = malloc(G->number_of_nodes * 3 * sizeof *(G->node_coordinates)); - - G->face_nodes = malloc(G->number_of_faces * 4 * sizeof *(G->face_nodes)); - G->face_nodepos = malloc((G->number_of_faces+1) * sizeof *(G->face_nodepos)); - G->face_cells = malloc(G->number_of_faces * 2 * sizeof *(G->face_cells)); - G->face_centroids = malloc(G->number_of_faces * 3 * sizeof *(G->face_centroids)); - G->face_normals = malloc(G->number_of_faces * 3 * sizeof *(G->face_normals)); - G->face_areas = malloc(G->number_of_faces * 1 * sizeof *(G->face_areas)); - - G->cell_faces = malloc(G->number_of_cells * 6 * sizeof *(G->cell_faces)); - G->cell_facepos = malloc((G->number_of_cells+1) * sizeof *(G->cell_facepos)); - G->cell_centroids = malloc(G->number_of_cells * 3 * sizeof *(G->cell_centroids)); - G->cell_volumes = malloc(G->number_of_cells * 1 * sizeof *(G->cell_volumes)); - - if ((G->face_nodes == NULL ) || - (G->face_nodepos == NULL ) || - (G->face_cells == NULL ) || - (G->face_centroids == NULL ) || - (G->face_normals == NULL ) || - (G->face_areas == NULL ) || - (G->cell_faces == NULL ) || - (G->cell_facepos == NULL ) || - (G->cell_centroids == NULL ) || - (G->cell_volumes == NULL ) ) - { - fprintf(stderr, "Cannot allocate space for grid.\n"); - exit(EXIT_FAILURE); - } - - cfaces = G->cell_faces; - cfacepos = G->cell_facepos; - ccentroids = G->cell_centroids; - cvolumes = G->cell_volumes; - cfacepos[0] = 0; - for (k=0; kface_nodes; - fnodepos = G->face_nodepos; - fcells = G->face_cells; - fnormals = G->face_normals; - fcentroids = G->face_centroids; - fareas = G->face_areas; - fnodepos[0] = 0; - - /* Faces with x-normal */ - for (k=0; knode_coordinates; - for (k=0; k