From 34d3de02dc183d38bf661789e98e43d9c1b4c0bd Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 23 Feb 2012 15:13:28 +0000
Subject: [PATCH] cell data removed
---
src/cell.c | 30 ++++++--------
src/main.c | 9 ++--
src/general.h | 7 +--
src/frame.c | 18 --------
4 files changed, 20 insertions(+), 44 deletions(-)
diff --git a/src/cell.c b/src/cell.c
index 1d66bc6..18586ee 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -19,19 +19,15 @@
if(clist->cell==NULL) fatal("Error while allocating memory for cell list! ncmax too large?",101);
for(i=0;i<nocells;i++){
- clist->cell[i]=(ts_cell *)malloc(sizeof(ts_cell));
+ clist->cell[i]=(ts_cell *)calloc(1,sizeof(ts_cell));
if(clist->cell[i]==NULL) fatal("Error while allocating memory for cell list! ncmax too large?",102);
clist->cell[i]->idx=i+1; // We enumerate cells! Probably never required!
- clist->cell[i]->data=(ts_cell_data *)calloc(1,sizeof(ts_cell_data));
}
return clist;
}
ts_bool cell_free(ts_cell* cell){
- if(cell->data!=NULL){
- if(cell->data->vertex!=NULL) free(cell->data->vertex);
- free(cell->data);
- }
+ if(cell->vertex!=NULL) free(cell->vertex);
free(cell);
return TS_SUCCESS;
}
@@ -74,12 +70,12 @@
//TODO: looks ok, but debug anyway in the future
ts_bool cell_add_vertex(ts_cell *cell, ts_vertex *vtx){
- cell->data->nvertex++;
- cell->data->vertex=(ts_vertex **)realloc(cell->data->vertex,cell->data->nvertex*sizeof(ts_vertex *));
- if(cell->data->vertex == NULL){
+ cell->nvertex++;
+ cell->vertex=(ts_vertex **)realloc(cell->vertex,cell->nvertex*sizeof(ts_vertex *));
+ if(cell->vertex == NULL){
fatal("Reallocation of memory failed during insertion of vertex in cell_add_vertex",3);
}
- cell->data->vertex[cell->data->nvertex-1]=vtx;
+ cell->vertex[cell->nvertex-1]=vtx;
return TS_SUCCESS;
}
@@ -87,11 +83,11 @@
ts_bool cell_list_cell_occupation_clear(ts_cell_list *clist){
ts_uint i;
for(i=0;i<clist->cellno;i++){
- if(clist->cell[i]->data->vertex != NULL){
- free(clist->cell[i]->data->vertex);
- clist->cell[i]->data->vertex=NULL;
+ if(clist->cell[i]->vertex != NULL){
+ free(clist->cell[i]->vertex);
+ clist->cell[i]->vertex=NULL;
}
- clist->cell[i]->data->nvertex=0;
+ clist->cell[i]->nvertex=0;
}
return TS_SUCCESS;
}
@@ -112,7 +108,7 @@
for(k=ncz-1;k<=ncz+1;k++){
neigh_cidx=k+(j-1)*clist->ncmax[2]+(i-1)*clist->ncmax[2]*clist->ncmax[1] -1;
// fprintf(stderr,"neigh_cell_index=%i\n",neigh_cidx);
- cell_occupation=clist->cell[neigh_cidx]->data->nvertex;
+ cell_occupation=clist->cell[neigh_cidx]->nvertex;
// fprintf(stderr, "cell_occupation=%i\n",cell_occupation);
if(cell_occupation>clist->max_occupancy){
fatal("Neighbouring cell occupation more than set max_occupancy value.",2000);
@@ -121,9 +117,9 @@
// cell!
if(cell_occupation>1){
for(l=0;l<cell_occupation;l++){
- if(clist->cell[neigh_cidx]->data->vertex[l]!=vtx){
+ if(clist->cell[neigh_cidx]->vertex[l]!=vtx){
// fprintf(stderr,"calling dist on vertex %i\n",l);
- dist=vtx_distance_sq(clist->cell[neigh_cidx]->data->vertex[l],tvtx);
+ dist=vtx_distance_sq(clist->cell[neigh_cidx]->vertex[l],tvtx);
// fprintf(stderr,"dist was %f\n",dist);
if(dist<1) return TS_FAIL;
}
diff --git a/src/frame.c b/src/frame.c
index faa1db8..a4a9d32 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -25,6 +25,7 @@
ts_double dcell;
shift=(ts_double) vesicle->clist->ncmax[0]/2;
dcell=1.0/(1.0 + vesicle->stepsize);
+ //`fprintf(stderr, "Bil sem tu\n");
cell_list_cell_occupation_clear(vesicle->clist);
for(i=0;i<n;i++){
@@ -33,25 +34,8 @@
cell_add_vertex(vesicle->clist->cell[cellidx],vesicle->vlist->vtx[i]);
- // if(ncx > vesicle->clist.ncmax[0]) vesicle->clist.ncmax[0]=ncx;
- // if(ncy > vesicle->clist.ncmax[1]) vesicle->clist.ncmax[1]=ncy;
- // if(ncz > vesicle->clist.ncmax[2]) vesicle->clist.ncmax[2]=ncz;
}
//fprintf(stderr, "Bil sem tu\n");
-
-
-/* This was already done in previous for loop.... Have I gained some time?
-
-
- for(i=0;i<vesicle->clist.ncmax[0]*vesicle->clist.ncmax[1]*vesicle->clist.ncmax[2];i++){
- vesicle->clist.cell[i].nvertex=0;
- for(j=0;j<vesicle->vlist.n;j++){
- //add_vertextocell;
- //add_vertextomonomer;
- }
- }
-
-*/
if(dcell);
if(shift);
return TS_SUCCESS;
diff --git a/src/general.h b/src/general.h
index 69cfd8b..6d2ab06 100644
--- a/src/general.h
+++ b/src/general.h
@@ -181,14 +181,11 @@
};
typedef struct ts_triangle_list ts_triangle_list;
-typedef struct ts_cell_data {
- ts_vertex **vertex;
- ts_uint nvertex;
-} ts_cell_data;
typedef struct ts_cell {
ts_uint idx;
- ts_cell_data *data;
+ ts_vertex **vertex;
+ ts_uint nvertex;
} ts_cell;
typedef struct ts_cell_list{
diff --git a/src/main.c b/src/main.c
index c402ebf..94e64ec 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,12 +44,12 @@
triangle_add(tlist,vlist->vtx[1],vlist->vtx[2],vlist->vtx[3]);
-printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
cell_add_vertex(clist->cell[0], vlist->vtx[0]);
-printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
-printf("Cell idx=1 has vertex[0] has x coordinate=%e\n",clist->cell[0]->data->vertex[0]->data->x);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
+printf("Cell idx=1 has vertex[0] has x coordinate=%e\n",clist->cell[0]->vertex[0]->data->x);
cell_list_cell_occupation_clear(clist);
-printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
cell_add_vertex(clist->cell[0], vlist->vtx[0]);
@@ -64,7 +64,6 @@
centermass(vesicle);
cell_occupation(vesicle);
-
for(i=0;i<100;i++){
single_timestep(vesicle);
write_vertex_xml_file(vesicle,i);
--
Gitblit v1.9.3