From ad4e7069f10b80446be8d13eba28a03c2c642a3b Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Fri, 13 Jun 2014 20:37:10 +0000 Subject: [PATCH] Now it works after remake! However, some crossection segments are in the list multiple times. --- src/initial_distribution.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/initial_distribution.c b/src/initial_distribution.c index 7d5647c..35d533d 100644 --- a/src/initial_distribution.c +++ b/src/initial_distribution.c @@ -12,6 +12,7 @@ #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); @@ -41,6 +42,7 @@ ts_vertex *vtx; vesicle=initial_distribution_dipyramid(tape->nshell,tape->ncxmax,tape->ncymax,tape->nczmax,tape->stepsize); + vesicle->tape=tape; // Nucleus: vesicle->R_nucleus=tape->R_nucleus*tape->R_nucleus; @@ -93,7 +95,12 @@ vesicle->pressure= tape->pressure; vesicle->pswitch=tape->pswitch; - vesicle->sphHarmonics=sph_init(vesicle->vlist,tape->shc); + if(tape->shc>0){ + vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,tape->shc); + } + else { + vesicle->sphHarmonics=NULL; + } return vesicle; } -- Gitblit v1.9.3