From 13f45e61241e43d709df10228b946ed9870e8ebb Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 23 Apr 2019 16:12:05 +0000
Subject: [PATCH] Fixing the vesicle 123 and neighbours just for a test
---
src/frame.c | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index 237aa87..5c473f7 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,11 +1,15 @@
+/* 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;
+ ts_double temp_z_cm=0;
vesicle->cm[0]=0;
vesicle->cm[1]=0;
vesicle->cm[2]=0;
@@ -17,6 +21,12 @@
vesicle->cm[0]/=(ts_float)n;
vesicle->cm[1]/=(ts_float)n;
vesicle->cm[2]/=(ts_float)n;
+
+ //center mass for z component does not change if we confine the vesicle with plates
+ if(vesicle->tape->plane_confinement_switch){
+ temp_z_cm=vesicle->cm[2];
+ vesicle->cm[2]=0;
+ }
for(i=0;i<n;i++){
vtx[i]->x-=vesicle->cm[0];
@@ -39,10 +49,21 @@
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;
+ if(vesicle->tape->plane_confinement_switch){
+ vesicle->cm[2]=temp_z_cm;
+ }
+
+ for(i=0;i<vesicle->tlist->n;i++){
+ triangle_normal_vector(vesicle->tlist->tria[i]);
+ }
+
return TS_SUCCESS;
}
@@ -60,20 +81,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