The initial distribution file has been rewritten. The structure of dipyrami...

Samo Penic

2010-12-04 7958e9880911c822dcb78d3e1ac743a0ccdc1e03

 src/main.c

@@ -4,8 +4,10 @@
#include "vertex.h"
#include "bond.h"
#include "triangle.h"
#include "cell.h"
#include "vesicle.h"
//#include "io.h"
//#include "initial_timestep.h"
#include "initial_distribution.h"

/** Entrance function to the program
  * @param argv is a number of parameters used in program call (including the program name
@@ -18,8 +20,8 @@
ts_vertex_list *vlist=init_vertex_list(5);
ts_bond_list *blist=init_bond_list();
ts_triangle_list *tlist=init_triangle_list();


ts_cell_list *clist=init_cell_list(3,3,3,0.3);
ts_vesicle *vesicle;

retval=vtx_add_cneighbour(blist,vlist->vtx[1],vlist->vtx[0]);
if(retval==TS_FAIL) printf("1. already a member or vertex is null!\n");
@@ -38,9 +40,24 @@

triangle_add(tlist,vlist->vtx[1],vlist->vtx[2],vlist->vtx[3]);

printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
cell_add_vertex(clist->cell[0], vlist->vtx[0]);
printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
printf("Cell idx=1 has vertex[0] has x coordinate=%e\n",clist->cell[0]->data->vertex[0]->data->x);
cell_list_cell_occupation_clear(clist);
printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
cell_add_vertex(clist->cell[0], vlist->vtx[0]);


triangle_list_free(tlist);
bond_list_free(blist);
vtx_list_free(vlist);
printf("Done.\n");
cell_list_free(clist);
printf("Tests complete.\n");

vesicle=initial_distribution_dipyramid(7,10,10,10,0.3);

vesicle_free(vesicle);

return 0; //program finished perfectly ok. We return 0.
}