From 459ff94855b2659de14ac2ac902b9658d28e19d5 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo@CAE-linux.(none)>
Date: Mon, 21 Apr 2014 11:11:37 +0000
Subject: [PATCH] Added complex spherical harmonics.
---
src/initial_distribution.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index 4d5f565..bff9f05 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -10,6 +10,9 @@
#include "initial_distribution.h"
#include "energy.h"
#include "poly.h"
+#include "io.h"
+#include "sh.h"
+#include "shcomplex.h"
ts_vesicle *initial_distribution_dipyramid(ts_uint nshell, ts_uint ncmax1, ts_uint ncmax2, ts_uint ncmax3, ts_double stepsize){
ts_fprintf(stdout,"Starting initial_distribution on vesicle with %u shells!...\n",nshell);
@@ -36,10 +39,47 @@
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);
- vesicle->poly_list=init_poly_list(tape->npoly,tape->nmono, vesicle->vlist);
+ // Nucleus:
+ vesicle->R_nucleus=tape->R_nucleus*tape->R_nucleus;
+
+ vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
+
+ //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);
+ poly_assign_filament_xi(vesicle,tape);
+
+ 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;
+ }
+ }
+ }
+
+ for(i=0;i<vesicle->filament_list->n;i++){
+ vertex_list_assign_id(vesicle->filament_list->poly[i]->vlist,TS_ID_FILAMENT);
+ }
+
+// vesicle->spring_constant=tape->kspring;
+// poly_assign_spring_const(vesicle);
+
vesicle->nshell=tape->nshell;
vesicle->dmax=tape->dmax*tape->dmax; /* dmax^2 in the vesicle dmax variable */
@@ -54,7 +94,12 @@
vesicle->pressure= tape->pressure;
vesicle->pswitch=tape->pswitch;
-
+ if(tape->shc>0){
+ vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,tape->shc);
+ }
+ else {
+ vesicle->sphHarmonics=NULL;
+ }
return vesicle;
}
--
Gitblit v1.9.3