From 7958e9880911c822dcb78d3e1ac743a0ccdc1e03 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo@andromeda> Date: Sat, 04 Dec 2010 20:56:15 +0000 Subject: [PATCH] The initial distribution file has been rewritten. The structure of dipyramid should be accurately recreated using new datastructure. While rewritting the new datastructure proved to be very easy to understand and no memory leaks occured. Still, some questions remains unanswered -- whether the vertex neighbours and links to bonds should be linked tightly together. --- src/main.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 77a84ab..b0886f6 100644 --- a/src/main.c +++ b/src/main.c @@ -5,8 +5,9 @@ #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 @@ -20,7 +21,7 @@ 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"); @@ -52,6 +53,11 @@ bond_list_free(blist); vtx_list_free(vlist); cell_list_free(clist); -printf("Done.\n"); +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. } -- Gitblit v1.9.3