From bcf4557ddd61890f130247430267feac5b05c5b7 Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Fri, 21 Mar 2014 09:39:35 +0000
Subject: [PATCH] Filament inside the vesicle added and debugged. Testing time...

---
 src/initial_distribution.c |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index c7eed90..3c27e55 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -37,22 +37,39 @@
 
 ts_vesicle *create_vesicle_from_tape(ts_tape *tape){
 	ts_vesicle *vesicle;
+	ts_vertex *vtx;
+
 	vesicle=initial_distribution_dipyramid(tape->nshell,tape->ncxmax,tape->ncymax,tape->nczmax,tape->stepsize);
 	// Nucleus:
 	vesicle->R_nucleus=tape->R_nucleus;
+
 	//Initialize grafted polymers (brush):
 	vesicle->poly_list=init_poly_list(tape->npoly,tape->nmono, vesicle->vlist, vesicle);
 	vesicle->spring_constant=tape->kspring;
 	poly_assign_spring_const(vesicle);
+
 	//Initialize filaments (polymers inside the vesicle):
 	vesicle->filament_list=init_poly_list(tape->nfil,tape->nfono, NULL, vesicle);
-ts_uint i,j;
-	for(i=0;i<vesicle->filament_list->n;i++){
-			for(j=0;j<vesicle->filament_list->poly[i]->vlist->n;j++){
+	poly_assign_filament_xi(vesicle,tape);
 
-	fprintf(stderr,"%e %e %e\n", vesicle->filament_list->poly[i]->vlist->vtx[j]->x,vesicle->filament_list->poly[i]->vlist->vtx[j]->y, vesicle->filament_list->poly[i]->vlist->vtx[j]->z );
+	ts_uint i,j;
+	for(i=0;i<vesicle->filament_list->n;i++){
+		for(j=0;j<vesicle->filament_list->poly[i]->blist->n;j++){
+			bond_vector(vesicle->filament_list->poly[i]->blist->bond[j]);
+			vesicle->filament_list->poly[i]->blist->bond[j]->bond_length = sqrt(vtx_distance_sq(vesicle->filament_list->poly[i]->blist->bond[j]->vtx1,vesicle->filament_list->poly[i]->blist->bond[j]->vtx2));
+		}
 	}
+
+	for(i=0;i<vesicle->filament_list->n;i++){
+		for(j=0;j<vesicle->filament_list->poly[i]->vlist->n;j++){
+			vtx = vesicle->filament_list->poly[i]->vlist->vtx[j];
+			if(vtx->bond_no == 2){
+			vtx->energy = -(vtx->bond[0]->x*vtx->bond[1]->x + vtx->bond[0]->y*vtx->bond[1]->y + vtx->bond[0]->z*vtx->bond[1]->z)/vtx->bond[0]->bond_length/vtx->bond[1]->bond_length;
+			}
+		}
 	}
+
+
 //	vesicle->spring_constant=tape->kspring;
 //	poly_assign_spring_const(vesicle);
 

--
Gitblit v1.9.3