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

Clarify a few other allocation-related comments.

Browse Source
This commit is contained in:
Bård Skaflestad 2012-03-02 19:05:03 +01:00
parent ef83b4f829
commit a82b1062ab
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/core/utility/cpgpreprocess/cgridinterface.c
View File

@ -211,6 +211,9 @@ preprocess (const struct grdecl *in, double tol)
pg.face_ptr = NULL; pg.face_ptr = NULL;
pg.face_neighbors = NULL; pg.face_neighbors = NULL;
/* Initialise subsequently allocated fields to a defined state lest
* we free() random pointers in free_grid() if either of the
* fill_cell_topology() or allocate_geometry() functions fail. */
g->face_centroids = NULL; g->face_centroids = NULL;
g->face_normals = NULL; g->face_normals = NULL;
g->face_areas = NULL; g->face_areas = NULL;
@ -218,13 +221,10 @@ preprocess (const struct grdecl *in, double tol)
g->cell_centroids = NULL; g->cell_centroids = NULL;
g->cell_volumes = NULL; g->cell_volumes = NULL;
/* Put ->global_cell in defined and harmless state to prevent g->global_cell = NULL;
* freeing a random pointer in case of failing to allocate geometry
* resources. */
g->global_cell = NULL;
/* allocate and fill g->cell_faces/g->cell_facepos and /* allocate and fill g->cell_faces/g->cell_facepos and
* g->cell_facetag */ * g->cell_facetag as well as the geometry-related fields. */
ok = fill_cell_topology(&pg, g); ok = fill_cell_topology(&pg, g);
ok = ok && allocate_geometry(g); ok = ok && allocate_geometry(g);