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 | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/main.c b/src/main.c
index d6c2854..b0886f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,8 +2,12 @@
#include<math.h>
#include "general.h"
#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
@@ -14,14 +18,46 @@
int main(int argv, char *argc[]){
ts_bool retval;
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_neighbour(VTX(1),VTX(0));
+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");
-retval=vtx_add_neighbour(VTX(0),VTX(1));
+
+retval=vtx_add_cneighbour(blist,vlist->vtx[0],vlist->vtx[1]);
if(retval==TS_FAIL) printf("2. already a member or vertex is null!\n");
-VTX_DATA(1)->x=1.0;
+
+retval=vtx_remove_neighbour(vlist->vtx[0],vlist->vtx[1]);
+vtx_add_neighbour(vlist->vtx[0],vlist->vtx[1]);
+
+vlist->vtx[0]->data->x=1.0;
+vlist->vtx[0]->data->x=1.1;
+
+bond_add(blist, vlist->vtx[1],vlist->vtx[0]);
+triangle_add(tlist,vlist->vtx[1],vlist->vtx[2],vlist->vtx[3]);
+
+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.
}
--
Gitblit v1.9.3