From 06afc729f9061c1cfa14c78728d61d518324c2f0 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 04 May 2022 05:46:43 +0000
Subject: [PATCH] Moved all global variables to separate file and defined extern keyword where appropriate
---
src/frame.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index d81ba7e..5c473f7 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -9,6 +9,7 @@
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;
@@ -20,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];
@@ -49,7 +56,9 @@
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]);
@@ -72,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