Merge branch 'trisurf-polyel'

Samo Penic

2014-03-21 ff8152b46e7957beffeafca580abc90df47d9d28

 src/timestep.c

@@ -23,7 +23,7 @@
      cell_occupation(vesicle);
      ts_fprintf(stdout,"Done %d out of %d iterations (x %d MC sweeps).\n",i+1,inititer+iterations,mcsweeps);
            dump_state(vesicle,i);
      if(i>inititer){
      if(i>=inititer){
         write_vertex_xml_file(vesicle,i-inititer);
      }
   }
@@ -62,9 +62,19 @@
      rnvec[2]=drand48();
      retval=single_poly_vertex_move(vesicle,vesicle->poly_list->poly[i],vesicle->poly_list->poly[i]->vlist->vtx[j],rnvec);   
   }

   }
 

   for(i=0;i<vesicle->filament_list->n;i++){
      for(j=0;j<vesicle->filament_list->poly[i]->vlist->n;j++){
         rnvec[0]=drand48();
         rnvec[1]=drand48();
         rnvec[2]=drand48();
         retval=single_filament_vertex_move(vesicle,vesicle->filament_list->poly[i],vesicle->filament_list->poly[i]->vlist->vtx[j],rnvec);	
      }
   }
 

//   printf("Bondflip success rate in one sweep: %d/%d=%e\n", cnt,3*vesicle->blist->n,(double)cnt/(double)vesicle->blist->n/3.0);
   if(retval);
    return TS_SUCCESS;