From b14a8d3d373ab1682a8a713e4f2a3795934d6b26 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 20 Oct 2013 13:36:53 +0000
Subject: [PATCH] Program parameters are finally read from tape. Initial tests are removed
---
src/main.c | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/src/main.c b/src/main.c
index a66e81b..c651382 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
@@ -16,36 +18,40 @@
*/
int main(int argv, char *argc[]){
+ts_uint i,n;
+ts_vesicle *vesicle;
+/* THIS SHOULD GO INTO UNIT TEST
ts_bool retval;
-ts_vertex_list *vlist=init_vertex_list(5);
+ 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");
-retval=vtx_add_cneighbour(blist,vlist->vtx[0],vlist->vtx[1]);
+retval=vtx_add_neighbour(vlist->vtx[0],vlist->vtx[1]);
if(retval==TS_FAIL) printf("2. already a member or vertex is null!\n");
-
-retval=vtx_remove_neighbour(vlist->vtx[0],vlist->vtx[1]);
+fprintf(stderr,"Was here");
+retval=vtx_remove_neighbour(vlist->vtx[1],vlist->vtx[0]);
vtx_add_neighbour(vlist->vtx[0],vlist->vtx[1]);
+fprintf(stderr,"Was here too!\n");
-vlist->vtx[0]->data->x=1.0;
-vlist->vtx[0]->data->x=1.1;
-
+vlist->vtx[0]->x=1.0;
+vlist->vtx[0]->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);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->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);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
+printf("Cell idx=1 has vertex[0] has x coordinate=%e\n",clist->cell[0]->vertex[0]->x);
cell_list_cell_occupation_clear(clist);
-printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
cell_add_vertex(clist->cell[0], vlist->vtx[0]);
@@ -53,11 +59,31 @@
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=parsetape(&n);
+
+//these four must come from parsetype!
+/*
+vesicle->dmax=1.67*1.67;
+vesicle->stepsize=0.15;
+vesicle->clist->max_occupancy=8;
+vesicle->bending_rigidity=25.0;
+*/
+// fprintf(stderr,"xk=%f\n",vesicle->bending_rigidity);
+
+centermass(vesicle);
+cell_occupation(vesicle);
+for(i=0;i<n;i++){
+single_timestep(vesicle);
+if(i%100==0){
+write_vertex_xml_file(vesicle,i/100);
+}
+}
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