Merge branch 'trout-rbc' of https://bitbucket.org/samop/trisurf-ng into tro...

mihaf

2014-04-11 091f7d56b288b83a32a2f7286ce532e5471ed49b

 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);
@@ -41,7 +42,9 @@

   vesicle=initial_distribution_dipyramid(tape->nshell,tape->ncxmax,tape->ncymax,tape->nczmax,tape->stepsize);
   // Nucleus:
   vesicle->R_nucleus=tape->R_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);
@@ -79,7 +82,6 @@
   
   vesicle->nshell=tape->nshell;
   vesicle->dmax=tape->dmax*tape->dmax; /* dmax^2 in the vesicle dmax variable */
   vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
   vesicle->bending_rigidity=tape->xk0;
   vtx_set_global_values(vesicle); /* make xk0 default value for every vertex */ 
   ts_fprintf(stdout, "Tape setting: xk0=%e\n",tape->xk0);
@@ -91,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;

}