Merge branch 'master' of https://bitbucket.org/samop/trisurf-ng

mihaf

2014-07-08 9d5216497310cf33ef3db2d511787a779ebccda3

 src/main.c

@@ -1,5 +1,6 @@
#include<stdio.h>
#include<math.h>
#include<stdlib.h>
#include "general.h"
#include "vertex.h"
#include "bond.h"
@@ -12,6 +13,7 @@
#include "timestep.h"
#include "poly.h"
#include "sh.h"
#include "shcomplex.h"

/** Entrance function to the program
  * @param argv is a number of parameters used in program call (including the program name
@@ -50,10 +52,15 @@
      vesicle->pressure=tape->pressure;
      vesicle->dmax=tape->dmax*tape->dmax;
      poly_assign_filament_xi(vesicle,tape);
        free(vesicle->tape);
        vesicle->tape=tape;
      vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;



        /* spherical harmonics */
        if(tape->shc>0){
           vesicle->sphHarmonics=sph_init(vesicle->vlist,tape->shc);
           vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,tape->shc);
        }
        else {
            vesicle->sphHarmonics=NULL;