From 514ebcb0e1b01fa41d022e3a92fe08a390a421dd Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 09 Dec 2018 21:35:42 +0000
Subject: [PATCH] Load settings from tape
---
src/frame.c | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index d2d7e10..68b8a84 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,7 +1,11 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<stdlib.h>
#include "general.h"
#include "cell.h"
#include "frame.h"
+
+
+#include "triangle.h"
ts_bool centermass(ts_vesicle *vesicle){
ts_uint i,j, n=vesicle->vlist->n;
ts_vertex **vtx=vesicle->vlist->vtx;
@@ -22,7 +26,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 +34,33 @@
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];
+ }
+ }
+//move nucleus for the same vector as we moved vesicle
+ vesicle->nucleus_center[0]-=vesicle->cm[0];
+ vesicle->nucleus_center[1]-=vesicle->cm[1];
+ vesicle->nucleus_center[2]-=vesicle->cm[2];
+ vesicle->cm[0]=0.0;
+ vesicle->cm[1]=0.0;
+ vesicle->cm[2]=0.0;
- vesicle->cm[0]=0;
- vesicle->cm[1]=0;
- vesicle->cm[2]=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,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 +71,24 @@
cell_add_vertex(vesicle->clist->cell[cellidx],vesicle->vlist->vtx[i]);
}
+//Add all polymers to cells
+if(vesicle->poly_list!=NULL){
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
+if(vesicle->filament_list!=NULL){
+ 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