From 08d2f85fef9e58d9f4fd3e787e7a950f9007fdb4 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Sun, 15 May 2016 11:12:45 +0000 Subject: [PATCH] in README.md changed some instructions what to install for python wrapper --- src/initial_distribution.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/initial_distribution.c b/src/initial_distribution.c index 0587d18..7dfd23d 100644 --- a/src/initial_distribution.c +++ b/src/initial_distribution.c @@ -1,3 +1,4 @@ +/* vim: set ts=4 sts=4 sw=4 noet : */ #include<stdlib.h> #include<math.h> #include<stdio.h> @@ -11,6 +12,8 @@ #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); @@ -37,10 +40,17 @@ 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->tape=tape; + set_vesicle_values_from_tape(vesicle); + return vesicle; +} + +ts_bool set_vesicle_values_from_tape(ts_vesicle *vesicle){ // Nucleus: + ts_vertex *vtx; + ts_tape *tape=vesicle->tape; vesicle->R_nucleus=tape->R_nucleus*tape->R_nucleus; vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies; @@ -92,8 +102,13 @@ vesicle->pressure= tape->pressure; vesicle->pswitch=tape->pswitch; - - return vesicle; + if(tape->shc>0){ + vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,tape->shc); + } + else { + vesicle->sphHarmonics=NULL; + } + return TS_SUCCESS; } -- Gitblit v1.9.3