From 6bc95bfe19012a33f185adf1476e623d98d33465 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 16 Dec 2014 20:30:08 +0000
Subject: [PATCH] Added missing header file
---
src/frame.c | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index b01c2d2..ec94292 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2,8 +2,11 @@
#include "general.h"
#include "cell.h"
#include "frame.h"
+
+
+#include "triangle.h"
ts_bool centermass(ts_vesicle *vesicle){
- ts_uint i, n=vesicle->vlist->n;
+ ts_uint i,j, n=vesicle->vlist->n;
ts_vertex **vtx=vesicle->vlist->vtx;
vesicle->cm[0]=0;
vesicle->cm[1]=0;
@@ -22,28 +25,62 @@
vtx[i]->y-=vesicle->cm[1];
vtx[i]->z-=vesicle->cm[2];
}
+//move polymers for the same vector as we moved vesicle
+ for(i=0;i<vesicle->poly_list->n;i++){
+ for(j=0;j<vesicle->poly_list->poly[i]->vlist->n;j++){
+ vesicle->poly_list->poly[i]->vlist->vtx[j]->x-=vesicle->cm[0];
+ vesicle->poly_list->poly[i]->vlist->vtx[j]->y-=vesicle->cm[1];
+ vesicle->poly_list->poly[i]->vlist->vtx[j]->z-=vesicle->cm[2];
+ }
+ }
+//move filaments for the same vector as we moved vesicle
+ for(i=0;i<vesicle->filament_list->n;i++){
+ for(j=0;j<vesicle->filament_list->poly[i]->vlist->n;j++){
+ vesicle->filament_list->poly[i]->vlist->vtx[j]->x-=vesicle->cm[0];
+ vesicle->filament_list->poly[i]->vlist->vtx[j]->y-=vesicle->cm[1];
+ vesicle->filament_list->poly[i]->vlist->vtx[j]->z-=vesicle->cm[2];
+ }
+ }
+
+ vesicle->cm[0]=0.0;
+ vesicle->cm[1]=0.0;
+ vesicle->cm[2]=0.0;
+
+ for(i=0;i<vesicle->tlist->n;i++){
+ triangle_normal_vector(vesicle->tlist->tria[i]);
+ }
+
return TS_SUCCESS;
}
ts_bool cell_occupation(ts_vesicle *vesicle){
- ts_uint i,cellidx, n=vesicle->vlist->n;
- ts_double shift;
- ts_double dcell;
- shift=(ts_double) vesicle->clist->ncmax[0]/2;
- dcell=1.0/(1.0 + vesicle->stepsize);
- //`fprintf(stderr, "Bil sem tu\n");
+ ts_uint i,j,cellidx, n=vesicle->vlist->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]->cell=vesicle->clist->cell[cellidx];
+// already done in cell_add_vertex
+// vesicle->vlist->vtx[i]->cell=vesicle->clist->cell[cellidx];
cell_add_vertex(vesicle->clist->cell[cellidx],vesicle->vlist->vtx[i]);
-
}
- //fprintf(stderr, "Bil sem tu\n");
- if(dcell);
- if(shift);
+
+//Add all polymers to cells
+ for(i=0;i<vesicle->poly_list->n;i++){
+ for(j=0;j<vesicle->poly_list->poly[i]->vlist->n;j++){
+ cellidx=vertex_self_avoidance(vesicle, vesicle->poly_list->poly[i]->vlist->vtx[j]);
+ cell_add_vertex(vesicle->clist->cell[cellidx],vesicle->poly_list->poly[i]->vlist->vtx[j]);
+ }
+ }
+//Add all filaments to cells
+ for(i=0;i<vesicle->filament_list->n;i++){
+ for(j=0;j<vesicle->filament_list->poly[i]->vlist->n;j++){
+ cellidx=vertex_self_avoidance(vesicle, vesicle->filament_list->poly[i]->vlist->vtx[j]);
+ cell_add_vertex(vesicle->clist->cell[cellidx],vesicle->filament_list->poly[i]->vlist->vtx[j]);
+ }
+ }
+
+
return TS_SUCCESS;
}
--
Gitblit v1.9.3