From dd5acac9147ee4e7a5b90f26953c19497626b945 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Wed, 30 Apr 2014 12:13:24 +0000
Subject: [PATCH] Debugged so it does not segfaults. It seems it keeps volume constant in one timestep, but it fails to do so after inner loop.
---
src/poly.c | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/src/poly.c b/src/poly.c
index aa41184..b2b13f9 100644
--- a/src/poly.c
+++ b/src/poly.c
@@ -6,6 +6,17 @@
#include<math.h>
#include"energy.h"
+ts_bool poly_assign_filament_xi(ts_vesicle *vesicle, ts_tape *tape){
+ ts_uint i;
+
+ for(i=0;i<vesicle->filament_list->n;i++){
+ vesicle->filament_list->poly[i]->k = tape->xi;
+ }
+
+ return TS_SUCCESS;
+}
+
+
ts_bool poly_assign_spring_const(ts_vesicle *vesicle){
ts_uint i;
@@ -47,7 +58,6 @@
ts_uint gvtxi;
ts_double xnorm,ynorm,znorm,normlength;
ts_double dphi,dh;
- ts_uint ji;
// Grafting polymers:
if (vlist!=NULL){
@@ -97,14 +107,29 @@
else
{
/* Make filaments inside the vesicle. Helix with radius... Dist. between poly vertices put to 1*/
- dphi = 2*asin(1/2/vesicle->R_nucleus)*1.001;
- dh = dphi/2/M_PI*1.001;
+ ts_double a,R,H,tantheta,h,r,phi,A0=1.2;
+
+ a = A0*(ts_double)vesicle->nshell;
+ R = A0*((ts_double)vesicle->nshell)/(2.0*sin(M_PI/5.0));
+ H = sqrt(a*a - R*R);
+ tantheta = sqrt(R*R - a*a/4.0)/H;
+
+ h = -H + sqrt(vesicle->clist->dmin_interspecies)*1.5;
+ r = (H-fabs(h))*tantheta - sqrt(vesicle->clist->dmin_interspecies)*1.5;
+ dphi = 2.0*asin(1.0/2.0/r)*1.001;
+ dh = dphi/2.0/M_PI*1.001;
+ phi=0.0;
for(i=0;i<poly_list->n;i++){
for (j=0;j<poly_list->poly[i]->vlist->n;j++){
- ji = j + i*poly_list->poly[i]->vlist->n;
- poly_list->poly[i]->vlist->vtx[j]->x = vesicle->R_nucleus*cos(ji*dphi);
- poly_list->poly[i]->vlist->vtx[j]->y = vesicle->R_nucleus*sin(ji*dphi);
- poly_list->poly[i]->vlist->vtx[j]->z = ji*dh;
+ h = h + dh;
+ r = (H-fabs(h))*tantheta - sqrt(vesicle->clist->dmin_interspecies)*1.5;
+ dphi = 2.0*asin(1.0/2.0/r)*1.001;
+ dh = dphi/2.0/M_PI*1.001;
+ phi+=dphi;
+ //ji = j + i*poly_list->poly[i]->vlist->n;
+ poly_list->poly[i]->vlist->vtx[j]->x = r*cos(phi);
+ poly_list->poly[i]->vlist->vtx[j]->y = r*sin(phi);
+ poly_list->poly[i]->vlist->vtx[j]->z = h;// ji*dh - (dh*poly_list->n*poly_list->poly[i]->vlist->n/2.0);
}
}
}
--
Gitblit v1.9.3