From 083e03adeaf985c9da1ed31d259ced9bb54c207c Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 06 Mar 2014 14:18:21 +0000
Subject: [PATCH] Started with arg parsing
---
src/main.c | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/src/main.c b/src/main.c
index 94e64ec..0c955dc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,6 +10,7 @@
#include "initial_distribution.h"
#include "frame.h"
#include "timestep.h"
+#include "poly.h"
/** Entrance function to the program
* @param argv is a number of parameters used in program call (including the program name
@@ -18,26 +19,32 @@
*/
int main(int argv, char *argc[]){
+ts_uint inititer,mcsweeps, iterations;
+ts_vesicle *vesicle, *vesicle1;
+
+
+parse_args(argv,argc);
+
+/* THIS SHOULD GO INTO UNIT TEST
ts_bool retval;
-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);
-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]);
@@ -47,7 +54,7 @@
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]->nvertex);
-printf("Cell idx=1 has vertex[0] has x coordinate=%e\n",clist->cell[0]->vertex[0]->data->x);
+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]->nvertex);
cell_add_vertex(clist->cell[0], vlist->vtx[0]);
@@ -60,14 +67,23 @@
vtx_list_free(vlist1);
printf("Tests complete.\n");
-vesicle=initial_distribution_dipyramid(17,60,60,60,0.15);
+*/
+if(force_from_tape){
+ts_fprintf(stdout,"****************************************************\n");
+ts_fprintf(stdout,"**** Reinitializing initial geometry from tape *****\n");
+ts_fprintf(stdout,"****************************************************\n\n");
+vesicle=parsetape(&mcsweeps, &inititer, &iterations);
+} else {
-centermass(vesicle);
-cell_occupation(vesicle);
-for(i=0;i<100;i++){
-single_timestep(vesicle);
-write_vertex_xml_file(vesicle,i);
+ts_fprintf(stdout,"**********************************************************************\n");
+ts_fprintf(stdout,"**** Recreating vesicle from dump file and continuing simulation *****\n");
+ts_fprintf(stdout,"**********************************************************************\n\n");
+vesicle1=parsetape(&mcsweeps, &inititer, &iterations);
+vesicle=restore_state();
+vesicle_free(vesicle1);
}
+
+run_simulation(vesicle, mcsweeps, inititer, iterations);
write_master_xml_file("test.pvd");
write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);
--
Gitblit v1.9.3