From 7ec6fb63c690080d0624c7bf138d0fd84fe7664e Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 15 May 2018 16:11:14 +0000
Subject: [PATCH] First working version, not debugged and energy assigned to vesicles on timesteps
---
src/frame.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index aeaef21..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;
@@ -38,10 +42,19 @@
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;
+
+ for(i=0;i<vesicle->tlist->n;i++){
+ triangle_normal_vector(vesicle->tlist->tria[i]);
+ }
+
return TS_SUCCESS;
}
@@ -59,20 +72,23 @@
}
//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]);
}
}
-
+}
return TS_SUCCESS;
}
--
Gitblit v1.9.3