From b01cc1ac677dc712c27337be8ee4f11ea336f31b Mon Sep 17 00:00:00 2001
From: Samo Penic <samo@andromeda>
Date: Sun, 05 Dec 2010 13:02:22 +0000
Subject: [PATCH] Fixed some nasty bugs. Still, I suspect the vertex neighbours are not correctly oriented or something, since tristar triangles are not successfully set. (tristar_no is not always the same as neigh_no!)
---
src/main.c | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/main.c b/src/main.c
index 3052ada..d0ee34d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4,8 +4,10 @@
#include "vertex.h"
#include "bond.h"
#include "triangle.h"
-//#include "io.h"
-//#include "initial_timestep.h"
+#include "cell.h"
+#include "vesicle.h"
+#include "io.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
@@ -16,10 +18,11 @@
int main(int argv, char *argc[]){
ts_bool retval;
ts_vertex_list *vlist=init_vertex_list(5);
+ts_vertex_list *vlist1;
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");
@@ -32,15 +35,32 @@
vlist->vtx[0]->data->x=1.0;
vlist->vtx[0]->data->x=1.1;
-
+vlist1=vertex_list_copy(vlist);
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);
+
+vtx_list_free(vlist1);
+printf("Tests complete.\n");
+vesicle=initial_distribution_dipyramid(7,10,10,10,0.3);
+write_vertex_xml_file(vesicle,0);
+write_master_xml_file("test.pvd");
+vesicle_free(vesicle);
+
return 0; //program finished perfectly ok. We return 0.
}
--
Gitblit v1.9.3