Merge branch 'master' of ssh://git.penic.eu:29418/trisurf-ng

Samo Penic

2019-02-08 19c1fd84d1fd75e9bfd55feb670fda87a2e02086

 src/initial_distribution.c

@@ -44,6 +44,7 @@
   vesicle=initial_distribution_dipyramid(tape->nshell,tape->ncxmax,tape->ncymax,tape->nczmax,tape->stepsize);
       vesicle->tape=tape;
   set_vesicle_values_from_tape(vesicle);
      initial_population_with_c0(vesicle,tape);
   return vesicle;
}

@@ -100,7 +101,7 @@
   vesicle->clist->ncmax[0]=tape->ncxmax;
   vesicle->clist->ncmax[1]=tape->ncymax;
   vesicle->clist->ncmax[2]=tape->nczmax;
   vesicle->clist->max_occupancy=8; /* hard coded max occupancy? */
   vesicle->clist->max_occupancy=16; /* hard coded max occupancy? */

   vesicle->pressure= tape->pressure;
   vesicle->pswitch=tape->pswitch;
@@ -111,9 +112,16 @@
        vesicle->sphHarmonics=NULL;
    }

   int rndvtx;
   vesicle->tlist->a0=sqrt(3)/4*pow((vesicle->tape->dmax+1.0)/2.0,2);  
    return TS_SUCCESS;

}


ts_bool initial_population_with_c0(ts_vesicle *vesicle, ts_tape *tape){
   int rndvtx,i,j;
   if(tape->number_of_vertices_with_c0>0){
      ts_fprintf(stderr,"Setting values for spontaneous curvature as defined in tape\n");
//      ts_fprintf(stderr,"Setting values for spontaneous curvature as defined in tape\n");
      j=0;
      for(i=0;i<tape->number_of_vertices_with_c0;i++){
         rndvtx=rand() % vesicle->vlist->n;
@@ -129,17 +137,12 @@
      }
      mean_curvature_and_energy(vesicle);
      if(fabs(tape->w)>1e-16){ //if nonzero energy
         ts_fprintf(stderr,"Setting attraction between vertices with spontaneous curvature\n");
//         ts_fprintf(stderr,"Setting attraction between vertices with spontaneous curvature\n");
         sweep_attraction_bond_energy(vesicle);
      }
   }
    
    return TS_SUCCESS;

   return TS_SUCCESS;
}





ts_bool pentagonal_dipyramid_vertex_distribution(ts_vertex_list *vlist){