Fixed a bug. added cells

Samo Penic

2014-03-06 063289f4f872d642078d70757685c728e3fdfc81

 src/main.c

@@ -10,6 +10,7 @@
#include "initial_distribution.h"
#include "frame.h"
#include "timestep.h"
#include "poly.h"

/** Entrance function to the program
  * @param argv is a number of parameters used in program call (including the program name
@@ -18,8 +19,8 @@
*/

int main(int argv, char *argc[]){
ts_uint i,n;
ts_vesicle *vesicle;
ts_uint inititer,mcsweeps, iterations;
ts_vesicle *vesicle, *vesicle1;
/* THIS SHOULD GO INTO UNIT TEST
ts_bool retval;
    ts_vertex_list *vlist=init_vertex_list(5);
@@ -63,25 +64,27 @@
vtx_list_free(vlist1);
printf("Tests complete.\n");
*/
vesicle=parsetape(&n);
vesicle1=parsetape(&mcsweeps, &inititer, &iterations);

//these four must come from parsetype!
/*
vesicle->dmax=1.67*1.67;
vesicle->stepsize=0.15;
vesicle->clist->max_occupancy=8;
vesicle->bending_rigidity=25.0;
*/
// fprintf(stderr,"xk=%f\n",vesicle->bending_rigidity);
/*Testing */
//vesicle->poly_list=init_poly_list(1400,20,vesicle->vlist);

centermass(vesicle);
cell_occupation(vesicle);
for(i=0;i<n;i++){
single_timestep(vesicle);
if(i%100==0){
write_vertex_xml_file(vesicle,i/100);
}
}
//poly_list_free(vesicle->poly_list);
/*End testing*/

//write_vertex_xml_file(vesicle,0);
//vesicle_free(vesicle);
dump_state(vesicle1);
vesicle=restore_state();
//write_vertex_xml_file(vesicle,1);
//write_master_xml_file("test.pvd");
//vesicle_free(vesicle1);
//vesicle_free(vesicle);
vesicle_free(vesicle1);
fprintf(stderr,"Starting simulation...");
run_simulation(vesicle, mcsweeps, inititer, iterations);
return 0;

write_master_xml_file("test.pvd");
write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);