Merge branch 'trout-rbc'

Samo Penic

2014-04-28 b36841fb1903e9945cb4a1dbc4dd7761556e07e2

 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);
@@ -93,7 +94,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;

}