From 091f7d56b288b83a32a2f7286ce532e5471ed49b Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Fri, 11 Apr 2014 08:10:45 +0000
Subject: [PATCH] Merge branch 'trout-rbc' of https://bitbucket.org/samop/trisurf-ng into trout-rbc
---
src/initial_distribution.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index 0587d18..5006a64 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -11,6 +11,7 @@
#include "energy.h"
#include "poly.h"
#include "io.h"
+#include "sh.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);
@@ -92,7 +93,12 @@
vesicle->pressure= tape->pressure;
vesicle->pswitch=tape->pswitch;
-
+ if(tape->shc>0){
+ vesicle->sphHarmonics=sph_init(vesicle->vlist,tape->shc);
+ }
+ else {
+ vesicle->sphHarmonics=NULL;
+ }
return vesicle;
}
--
Gitblit v1.9.3