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

Explicitly relinquish resources from processed_grid conveyed onto the UnstructuredGrid.

Browse Source 
This enables calling free_processed_grid() at the end of preprocess(),
whence all resources allocated in process_grdecl() and present in the
processed_grid can be properly disposed of, even in case of extending
the processed_grid structure.
This commit is contained in:
Bård Skaflestad 2012-03-02 19:00:59 +01:00
parent dc2974e8f0
commit ef83b4f829
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,6 +203,14 @@ preprocess (const struct grdecl *in, double tol)
g->face_nodepos = pg.face_ptr; g->face_nodepos = pg.face_ptr;
g->face_cells = pg.face_neighbors; g->face_cells = pg.face_neighbors;
/* Explicitly relinquish resource references conveyed to 'g'. This
* is needed to avoid creating dangling references in the
* free_processed_grid() call. */
pg.node_coordinates = NULL;
pg.face_nodes = NULL;
pg.face_ptr = NULL;
pg.face_neighbors = NULL;
g->face_centroids = NULL; g->face_centroids = NULL;
g->face_normals = NULL; g->face_normals = NULL;
g->face_areas = NULL; g->face_areas = NULL;
@ -235,7 +243,14 @@ preprocess (const struct grdecl *in, double tol)
g->cartdims[2] = pg.dimensions[2]; g->cartdims[2] = pg.dimensions[2];
g->global_cell = pg.local_cell_index; g->global_cell = pg.local_cell_index;
/* Explicitly relinquish resource references conveyed to 'g'.
* This is needed to avoid creating dangling references in the
* free_processed_grid() call. */
pg.local_cell_index = NULL;
} }
free_processed_grid(&pg);
return g; return g;
} }