From 42641cde38cfd1d27a2031604cc1397b5bd2849b Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 21 Mar 2014 20:57:24 +0000
Subject: [PATCH] Merge with trout-rnc.
---
src/frame.c | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index d2d7e10..aeaef21 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -22,7 +22,7 @@
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];
@@ -30,22 +30,24 @@
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;
- vesicle->cm[1]=0;
- vesicle->cm[2]=0;
+ vesicle->cm[0]=0.0;
+ vesicle->cm[1]=0.0;
+ vesicle->cm[2]=0.0;
return TS_SUCCESS;
}
ts_bool cell_occupation(ts_vesicle *vesicle){
ts_uint i,j,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");
cell_list_cell_occupation_clear(vesicle->clist);
for(i=0;i<n;i++){
@@ -56,17 +58,21 @@
cell_add_vertex(vesicle->clist->cell[cellidx],vesicle->vlist->vtx[i]);
}
+//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]);
+ }
+ }
+
-
-
- //fprintf(stderr, "Bil sem tu\n");
- //if(dcell);
- //if(shift);
return TS_SUCCESS;
}
--
Gitblit v1.9.3