From 41a0355002fda513dbf8d878b6793e1f21a20ef1 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 23 Feb 2012 14:37:22 +0000
Subject: [PATCH] triangle data removed
---
src/main.c | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main.c b/src/main.c
index a66e81b..c402ebf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -8,6 +8,8 @@
#include "vesicle.h"
#include "io.h"
#include "initial_distribution.h"
+#include "frame.h"
+#include "timestep.h"
/** Entrance function to the program
* @param argv is a number of parameters used in program call (including the program name
@@ -17,7 +19,9 @@
int main(int argv, char *argc[]){
ts_bool retval;
-ts_vertex_list *vlist=init_vertex_list(5);
+ts_uint i;
+ 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);
@@ -34,7 +38,7 @@
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]);
@@ -53,11 +57,20 @@
bond_list_free(blist);
vtx_list_free(vlist);
cell_list_free(clist);
-printf("Tests complete.\n");
-vesicle=initial_distribution_dipyramid(7,10,10,10,0.3);
-write_vertex_xml_file(vesicle,0);
+vtx_list_free(vlist1);
+printf("Tests complete.\n");
+vesicle=initial_distribution_dipyramid(17,60,60,60,0.15);
+
+centermass(vesicle);
+cell_occupation(vesicle);
+
+for(i=0;i<100;i++){
+single_timestep(vesicle);
+write_vertex_xml_file(vesicle,i);
+}
write_master_xml_file("test.pvd");
+write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);
return 0; //program finished perfectly ok. We return 0.
--
Gitblit v1.9.3