Merge branch 'bondflip'

Samo Penic

2012-07-10 737e1c8236e7e9b72cf08c5d173e0a307c38600c

 src/spherical_trisurf.c

@@ -32,6 +32,7 @@
vesicle->bending_rigidity=25.0;
//fprintf(stderr,"xk=%f",vesicle->bending_rigidity);

   centermass(vesicle);
vesicle->sphHarmonics=sph_init(vesicle->vlist, 21);

vesicle_volume(vesicle);
@@ -43,21 +44,21 @@



for(i=0;i<10;i++){
   centermass(vesicle);
for(i=0;i<10000;i++){
   cell_occupation(vesicle);
   for(j=0;j<1000;j++){
      single_timestep(vesicle);
   }   
vesicle_volume(vesicle);
r0=getR0(vesicle);
   centermass(vesicle);
    vesicle_volume(vesicle);
    r0=getR0(vesicle);

preparationSh(vesicle,r0);
calculateYlmi(vesicle);
calculateUlm(vesicle);
    preparationSh(vesicle,r0);
    calculateYlmi(vesicle);
    calculateUlm(vesicle);

storeUlm2(vesicle);
saveAvgUlm2(vesicle);
    storeUlm2(vesicle);
    saveAvgUlm2(vesicle);

   write_vertex_xml_file(vesicle,i);
   fprintf(stderr, "Loop %d completed.\n",i+1);
@@ -89,6 +90,7 @@
      fprintf(fh,"%d,\t%d,\t%e\n", i, j-i, sph->sumUlm2[i][j]/(ts_double)sph->N);

          }
    fprintf(fh,"\n");
   }
   fclose(fh);
   return TS_SUCCESS;