From 0fb40c28545e8418469cf7d3600547dfe4083edb Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 08 Mar 2014 12:00:38 +0000
Subject: [PATCH] Merged with dump-state. Added some arg switches that need to be inished
---
src/main.c | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/main.c b/src/main.c
index 705d8de..0c955dc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,6 +21,10 @@
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);
@@ -64,19 +68,22 @@
vtx_list_free(vlist1);
printf("Tests complete.\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);
+} 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);
-
-/*Testing */
-//vesicle->poly_list=init_poly_list(1400,20,vesicle->vlist);
-
-//poly_list_free(vesicle->poly_list);
-/*End testing*/
-
-dump_state(vesicle1);
-
vesicle=restore_state();
-//vesicle_free(vesicle1);
-run_simulation(vesicle1, mcsweeps, inititer, iterations);
+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