From 23d807748be58e5178c04304d9cc788bf122eb12 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@fe.uni-lj.si> Date: Tue, 11 Feb 2014 15:34:18 +0000 Subject: [PATCH] Make changes in memory allocation. Memory reservation is done, but pointers are not linked into corresponding structure. A lot to be done still. However, check how pointers can be recalculated at any time when the block is copied in memory. --- src/general.h | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/general.h b/src/general.h index f3328f6..afd238b 100644 --- a/src/general.h +++ b/src/general.h @@ -240,14 +240,40 @@ ts_spharm *sphHarmonics; } ts_vesicle; - - +typedef struct { + ts_uint vertex_no; + ts_uint ncmax[3]; + ts_vesicle *vesicle; + ts_vertex_list *vlist; + ts_bond_list *blist; + ts_triangle_list *tlist; + ts_cell_list *clist; + ts_vertex **vtx_ptr; + ts_vertex *vtx; + ts_vertex *vtx_neighbours; + ts_vertex **vtx_neighbours_ptr; + ts_bond **vtx_neighbond; + ts_triangle **tristar; + ts_triangle **tria_ptr; + ts_triangle *tria; + ts_triangle **trianeigh; + ts_bond **bond_ptr; + ts_bond *bond; + ts_cell **cell_ptr; + ts_cell *cell; + ts_vertex **cell_ocupancy; + /* ts_spharm *sphHarmonics; */ +} ts_memory; /* GLOBAL VARIABLES */ int quiet; +/* ERROR CODES */ +#define TS_ERR_MEM_ALLOC 1 + + /* FUNCTIONS */ /** Non-fatal error function handler: -- Gitblit v1.9.3