From 06afc729f9061c1cfa14c78728d61d518324c2f0 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 04 May 2022 05:46:43 +0000
Subject: [PATCH] Moved all global variables to separate file and defined extern keyword where appropriate
---
src/cell.c | 72 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 17 deletions(-)
diff --git a/src/cell.c b/src/cell.c
index 47d7fab..3df15ea 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<stdlib.h>
#include "general.h"
#include "vertex.h"
@@ -5,7 +6,7 @@
ts_cell_list *init_cell_list(ts_uint ncmax1, ts_uint ncmax2, ts_uint ncmax3, ts_double stepsize){
ts_uint i;
ts_uint nocells=ncmax1*ncmax2*ncmax3;
- ts_cell_list *clist=(ts_cell_list *)malloc(sizeof(ts_cell_list));
+ ts_cell_list *clist=(ts_cell_list *)calloc(1,sizeof(ts_cell_list));
if(clist==NULL) fatal("Error while allocating memory for cell list!",100);
clist->ncmax[0]=ncmax1;
@@ -14,8 +15,8 @@
clist->cellno=nocells;
clist->dcell=1.0/(1.0 + stepsize);
clist->shift=(ts_double) clist->ncmax[0]/2;
-
- clist->cell=(ts_cell **)malloc(nocells*sizeof(ts_cell *));
+ clist->max_occupancy=16; /* hard coded max occupancy? */
+ clist->cell=(ts_cell **)calloc(nocells,sizeof(ts_cell *));
if(clist->cell==NULL) fatal("Error while allocating memory for cell list! ncmax too large?",101);
for(i=0;i<nocells;i++){
@@ -44,7 +45,6 @@
}
-//TODO: not debugged at all!
inline ts_uint vertex_self_avoidance(ts_vesicle *vesicle, ts_vertex *vtx){
ts_uint cellidx;
ts_uint ncx, ncy,ncz;
@@ -53,13 +53,13 @@
ncy=(ts_uint)((vtx->y-vesicle->cm[1])*clist->dcell+clist->shift);
ncz=(ts_uint)((vtx->z-vesicle->cm[2])*clist->dcell+clist->shift);
- if(ncx == clist->ncmax[0]-1 || ncx == 2){
+ if(ncx >= clist->ncmax[0]-1 || ncx <= 2){
fatal("Vesicle is positioned outside the cell covered area. Coordinate x is the problem.",1500);
}
- if(ncy == clist->ncmax[1]-1 || ncy == 2){
+ if(ncy >= clist->ncmax[1]-1 || ncy <= 2){
fatal("Vesicle is positioned outside the cell covered area. Coordinate y is the problem.",1500);
}
- if(ncz == clist->ncmax[2]-1 || ncz == 2){
+ if(ncz >= clist->ncmax[2]-1 || ncz <= 2){
fatal("Vesicle is positioned outside the cell covered area. Coordinate z is the problem.",1500);
}
cellidx=ncz+(ncy-1)*clist->ncmax[2] + (ncx-1)*clist->ncmax[2]*
@@ -68,17 +68,48 @@
}
-//TODO: looks ok, but debug anyway in the future
-ts_bool cell_add_vertex(ts_cell *cell, ts_vertex *vtx){
+inline ts_bool cell_add_vertex(ts_cell *cell, ts_vertex *vtx){
+ ts_uint i;
+ for(i=0;i<cell->nvertex;i++){
+ if(cell->vertex[i]==vtx){
+ //vertex is already in the cell!
+ //fprintf(stderr,"VTX in the cell!\n");
+ return TS_FAIL;
+ }
+ }
+ //fprintf(stderr,"VTX added to the cell!\n");
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->vertex[cell->nvertex-1]=vtx;
+ vtx->cell=cell;
return TS_SUCCESS;
}
+inline ts_bool cell_remove_vertex(ts_cell *cell, ts_vertex *vtx){
+ ts_uint i,j=0;
+ for(i=0;i<cell->nvertex;i++){
+ if(cell->vertex[i]!=vtx){
+ cell->vertex[j]=cell->vertex[i];
+ j++;
+ }
+ }
+ if(j==i){
+ fatal("Vertex was not in the cell!",3);
+ }
+ //fprintf(stderr, "Vertex deleted from the cell!\n");
+
+/* resize memory. potentionally time consuming */
+ cell->nvertex--;
+ cell->vertex=(ts_vertex **)realloc(cell->vertex,cell->nvertex*sizeof(ts_vertex *));
+ if(vtx->neigh == NULL && vtx->neigh_no!=0)
+ if(cell->vertex == NULL){
+ fatal("Reallocation of memory failed during removal of vertex in cell_remove_vertex",3);
+ }
+ return TS_SUCCESS;
+}
ts_bool cell_list_cell_occupation_clear(ts_cell_list *clist){
ts_uint i;
@@ -92,8 +123,8 @@
return TS_SUCCESS;
}
-// TODO: compiles ok, but it is completely untested and undebugged. It was debugged before rewrite, but this was long time ago.
-ts_bool cell_occupation_number_and_internal_proximity(ts_cell_list *clist, ts_uint cellidx, ts_vertex *vtx, ts_vertex *tvtx){
+
+ts_bool cell_occupation_number_and_internal_proximity(ts_cell_list *clist, ts_uint cellidx, ts_vertex *vtx){
ts_uint ncx,ncy,ncz,remainder,cell_occupation;
ts_uint i,j,k,l,neigh_cidx;
ts_double dist;
@@ -111,23 +142,30 @@
cell_occupation=clist->cell[neigh_cidx]->nvertex;
// fprintf(stderr, "cell_occupation=%i\n",cell_occupation);
if(cell_occupation>clist->max_occupancy){
+ ts_fprintf(stderr,"max occupancy= %d, cell occupation= %d", clist->max_occupancy, cell_occupation);
fatal("Neighbouring cell occupation more than set max_occupancy value.",2000);
}
// Now we check whether we didn't come close to some other vertices in the same
// cell!
- if(cell_occupation>1){
+ if(cell_occupation>0){
for(l=0;l<cell_occupation;l++){
+
+ //carefull with this checks!
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]->vertex[l],tvtx);
- // fprintf(stderr,"dist was %f\n",dist);
- if(dist<1) return TS_FAIL;
+ dist=vtx_distance_sq(clist->cell[neigh_cidx]->vertex[l],vtx);
+
+// if(vtx->idx==1)
+// fprintf(stderr,"VTX(0) ima bliznji vertex z indeksom, %d, tipa %d \n", clist->cell[neigh_cidx]->vertex[l]->idx, clist->cell[neigh_cidx]->vertex[l]->id);
+// if(vtx->idx==0 && clist->cell[neigh_cidx]->vertex[l]->idx==0)
+// fprintf(stderr,"*** dist was %f\n",dist);
+
+ if(dist<=1.0 || (dist<=clist->dmin_interspecies && (clist->cell[neigh_cidx]->vertex[l]->id != vtx->id))) return TS_FAIL;
}
}
}
}
}
- }
-
+ }
return TS_SUCCESS;
}
--
Gitblit v1.9.3