From eb86057daf38a5964f0dc570243b8e60d299f2ac Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 07 Jun 2012 13:38:49 +0000
Subject: [PATCH] Ylmi swithed back to ts_spharm
---
src/frame.c | 36 +++++++++++-------------------------
1 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index a578188..63a4f7b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -9,13 +9,13 @@
vesicle->cm[1]=0;
vesicle->cm[2]=0;
for(i=0;i<n;i++){
- vesicle->cm[0]+=vtx[i]->data->x;
- vesicle->cm[1]+=vtx[i]->data->y;
- vesicle->cm[2]+=vtx[i]->data->z;
+ vesicle->cm[0]+=vtx[i]->x;
+ vesicle->cm[1]+=vtx[i]->y;
+ vesicle->cm[2]+=vtx[i]->z;
}
- vesicle->cm[0]/=(float)n;
- vesicle->cm[1]/=(float)n;
- vesicle->cm[2]/=(float)n;
+ vesicle->cm[0]/=(ts_float)n;
+ vesicle->cm[1]/=(ts_float)n;
+ vesicle->cm[2]/=(ts_float)n;
return TS_SUCCESS;
}
@@ -25,32 +25,18 @@
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++){
-
cellidx=vertex_self_avoidance(vesicle, vesicle->vlist->vtx[i]);
- vesicle->vlist->vtx[i]->data->cell=vesicle->clist->cell[cellidx];
+ vesicle->vlist->vtx[i]->cell=vesicle->clist->cell[cellidx];
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;
}
-
-
-/* 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;
- }
- }
-
-*/
+ //fprintf(stderr, "Bil sem tu\n");
+ if(dcell);
+ if(shift);
return TS_SUCCESS;
}
--
Gitblit v1.9.3