From 1ab449a2d9d4433794736566014f5c311d5a9317 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 08 Mar 2014 16:33:08 +0000
Subject: [PATCH] tape fixed, output has additional timestamp, ncurrent iteration is dumped and reread, but simulation is not restarted at correct time
---
src/main.c | 66 +++++---------------------------
1 files changed, 11 insertions(+), 55 deletions(-)
diff --git a/src/main.c b/src/main.c
index 0c955dc..44d90e2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,74 +19,30 @@
*/
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_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);
-
-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(vlist->vtx[0],vlist->vtx[1]);
-if(retval==TS_FAIL) printf("2. already a member or vertex is null!\n");
-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]->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]->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]->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]);
-
-
-triangle_list_free(tlist);
-bond_list_free(blist);
-vtx_list_free(vlist);
-cell_list_free(clist);
-
-vtx_list_free(vlist1);
-printf("Tests complete.\n");
-*/
+ ts_vesicle *vesicle;
+ ts_tape *tape;
+ ts_uint start_iteration=0;
+ parse_args(argv,argc);
+ ts_fprintf(stdout,"\nStarting program...\n\n");
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);
+tape=parsetape("tape");
+vesicle=create_vesicle_from_tape(tape);
} else {
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);
+tape=parsetape("tape");
+vesicle=restore_state(&start_iteration);
}
-run_simulation(vesicle, mcsweeps, inititer, iterations);
+run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations);
write_master_xml_file("test.pvd");
write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);
-
+tape_free(tape);
return 0; //program finished perfectly ok. We return 0.
}
--
Gitblit v1.9.3